| commit | e404a7001ae8d74c6803975d513e0501207f6fe6 | [log] [tgz] |
|---|---|---|
| author | Daniel Rosenberg <drosen@google.com> | Thu Aug 27 14:24:28 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:24:28 2015 +0000 |
| tree | 5672430a9f41c6eb948db44ee1706bd3fb354ba9 | |
| parent | c4fd6394f402f569c0da75a2bfe7a28dc90557fa [diff] | |
| parent | 75a5df4f79207492bdc6bb2e6860efdfdb3342d7 [diff] |
am 861dfa79: am be92912d: (-s ours) resolved conflicts for merge of 074ee014 to mnc-dev-plus-aosp * commit '861dfa7917a79f8bffbb35a51f52a43b59b836bf':