| commit | 31bc159b185a44acedbee78fa12b142ac9e21cf4 | [log] [tgz] |
|---|---|---|
| author | Daniel Rosenberg <drosen@google.com> | Thu Aug 27 11:39:18 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:39:18 2015 +0000 |
| tree | 8c31250a527d15d67e52f8d8871ae6062178ee22 | |
| parent | cc681d5ce6ee5903d39a0613174f7302332c36e6 [diff] | |
| parent | e12d5793b2562412ad1bff42ba371992e4fa452b [diff] |
am 15db3551: (-s ours) resolved conflicts for merge of 074ee014 to mnc-dev-plus-aosp * commit '15db3551d005a58407a8ac97b73a879530dd3e74': resolved conflicts for merge of 074ee014 to mnc-dev-plus-aosp