| commit | 487a7027b019e240f17a2f4b235c28d5fca272e4 | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <[email protected]> | Tue Jun 17 20:17:33 2014 +0000 |
| committer | Android Git Automerger <[email protected]> | Tue Jun 17 20:17:33 2014 +0000 |
| tree | 45c3223421da7b974a456d198ad2903df3076077 | |
| parent | 0df67453b84d23b381e07e0d9c0d121b011ed0d2 [diff] | |
| parent | 2696fe79d84fae9100e7149b35e0d82e53fc2ca1 [diff] |
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 '2696fe79d84fae9100e7149b35e0d82e53fc2ca1': DO NOT MERGE: Fix Early CCS bug