| commit | d1b160f362e4d2bd961d8091b438f8eeb7d61a2f | [log] [tgz] |
|---|---|---|
| author | Dan Sandler <dsandler@android.com> | Sun Aug 16 02:54:36 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Aug 16 02:54:36 2015 +0000 |
| tree | 2ad7440a82366366c156e40e69bf1b9b213c1bba | |
| parent | 92f58f7cfca7dfb28428cb3ed17970c5e63085b1 [diff] | |
| parent | 87c1e1b8a1f6927d2c31375e83fd353110edd326 [diff] |
am 87c1e1b8: am 415c6cb2: am 8c8387d2: resolved conflicts (again!) for merge of 8ad3e817 to mnc-dr-dev * commit '87c1e1b8a1f6927d2c31375e83fd353110edd326': "I tried to think of the most harmless thing."