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