| commit | 2696fe79d84fae9100e7149b35e0d82e53fc2ca1 | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <[email protected]> | Tue Jun 17 20:13:15 2014 +0000 |
| committer | Android Git Automerger <[email protected]> | Tue Jun 17 20:13:15 2014 +0000 |
| tree | b98f769dcab8326c846f24c86fcfdd09d69abe49 | |
| parent | 34dfa1f4360cdb3ce1678480804a9cd24ca78697 [diff] | |
| parent | 268c08fcdb2602a78edec8b4b37d4ac708cc39e8 [diff] |
am 268c08fc: am 1a96f398: am 83469089: am 24029085: am e4875786: am 1a4208b6: resolved conflicts for merge of cd4735f3 to jb-dev-plus-aosp * commit '268c08fcdb2602a78edec8b4b37d4ac708cc39e8': DO NOT MERGE: Fix Early CCS bug