| commit | 9dc731b918a9d7fd55f06a8852c16ad7ad59925b | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <[email protected]> | Thu Jun 05 22:15:33 2014 +0000 |
| committer | Android Git Automerger <[email protected]> | Thu Jun 05 22:15:33 2014 +0000 |
| tree | 207724aa3a79d1c75aa4471d34902b9bf726195c | |
| parent | a60d393562f7d952fbc83bf06a695757617e42c6 [diff] | |
| parent | 34dfa1f4360cdb3ce1678480804a9cd24ca78697 [diff] |
am 34dfa1f4: am 5bdfc00c: am 53338431: am e03b8bee: am ce79d641: resolved conflicts for merge of 4a040c3a to jb-mr1-dev-plus-aosp * commit '34dfa1f4360cdb3ce1678480804a9cd24ca78697': Fix Early CCS bug