| commit | 018407dd68835407d7f4f08c0f349a725141f6f0 | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <[email protected]> | Tue Jun 17 20:21:41 2014 +0000 |
| committer | Android Git Automerger <[email protected]> | Tue Jun 17 20:21:41 2014 +0000 |
| tree | 339b569e9c4f8c617996a1846d4263b567096f4b | |
| parent | 1bf8f4918e169fc048fc717071ad0629d8ce5815 [diff] | |
| parent | 487a7027b019e240f17a2f4b235c28d5fca272e4 [diff] |
am 487a7027: am 2696fe79: am 268c08fc: am 1a96f398: am 83469089: am 24029085: am e4875786: am 1a4208b6: resolved conflicts for merge of cd4735f3 to jb-dev-plus-aosp * commit '487a7027b019e240f17a2f4b235c28d5fca272e4': DO NOT MERGE: Fix Early CCS bug