| commit | 1f0a3c3d3e2fd0e422a1deb6fcd8e68fa2ce5111 | [log] [tgz] |
|---|---|---|
| author | Andrew Solovay <asolovay@google.com> | Thu Aug 27 20:03:03 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 20:03:03 2015 +0000 |
| tree | acd3e38539512eb037d74a6af7719b655d80b613 | |
| parent | a7f5194c8845cb8901d602dc2411ffca12264bff [diff] | |
| parent | f081d26ecc26e88c10aca8a8cc3598e5dc4504d6 [diff] |
am f081d26e: am ad7d95bd: (-s ours) am af46e1b4: resolved conflicts for merge of 44053b4e to mnc-dev * commit 'f081d26ecc26e88c10aca8a8cc3598e5dc4504d6':