| commit | 5e2447b903a67509444bb32c892251dd402dac34 | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Thu Jul 23 22:06:21 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 23 22:06:21 2015 +0000 |
| tree | bb98b3ee9926b8108dbd1a2fcb9e2f63224b7388 | |
| parent | 353e6a1b8ca37608d2073632b76578a21243b167 [diff] | |
| parent | aebb144b3c2651f19109c8f70f809e6e9f1a2e49 [diff] |
am aebb144b: am e674e950: am 9fb98375: am b30f841c: resolved conflicts for merge of c1244a29 to mnc-dr-dev * commit 'aebb144b3c2651f19109c8f70f809e6e9f1a2e49': Touch, wake and unlock