| commit | f081d26ecc26e88c10aca8a8cc3598e5dc4504d6 | [log] [tgz] |
|---|---|---|
| author | Andrew Solovay <asolovay@google.com> | Thu Aug 27 10:35:35 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 10:35:35 2015 +0000 |
| tree | 715d547d2502de8d04de0ec12233b3183ce62c99 | |
| parent | 3609c5552f78a350762b82ed4f581961ef60b4f4 [diff] | |
| parent | ad7d95bdcf849d9a13c0ff021beb1c7692e419ea [diff] |
am ad7d95bd: (-s ours) am af46e1b4: resolved conflicts for merge of 44053b4e to mnc-dev * commit 'ad7d95bdcf849d9a13c0ff021beb1c7692e419ea':