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