| commit | bd392334d489818639c5c0909f71b152362cde1b | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <[email protected]> | Thu Jun 05 21:50:57 2014 +0000 |
| committer | Android Git Automerger <[email protected]> | Thu Jun 05 21:50:57 2014 +0000 |
| tree | 60d7613c3615dd2cfef2171eff882a556961bdcb | |
| parent | 4797e430d892664fc83b8a6f93a2f74c621b8f9e [diff] | |
| parent | a60d393562f7d952fbc83bf06a695757617e42c6 [diff] |
am a60d3935: am 5e43150f: am d91503d9: am cf15f43b: resolved conflicts for merge of f021a8c5 to jb-mr2-dev-plus-aosp * commit 'a60d393562f7d952fbc83bf06a695757617e42c6': Fix Early CCS bug