| commit | 84c5c08e3ba2a870f291b5d1a548fb6c16f79079 | [log] [tgz] |
|---|---|---|
| author | Adam Lesinski <adamlesinski@google.com> | Wed Jan 13 00:43:39 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Jan 13 00:43:39 2016 +0000 |
| tree | 88a8d6dc5e8251ffff5fe5fdef3824b6b1742e74 | |
| parent | 23f9efcee3a512089ab7ab60d1ad78fbfca00754 [diff] | |
| parent | 881f6f9266ca15e7c6302d659b07d06ecfe40300 [diff] |
Merge "resolve merge conflicts of 551fc6823a to master."