| commit | a38bb11ff4c7736a969a969ec57644e4b7207a0e | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Mon Jul 11 21:06:42 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Jul 11 21:06:42 2016 +0000 |
| tree | 18f246750bb2af3535936a79ed3665169dec0131 | |
| parent | b8a19f4499240fbc8bc88a7e4fd0365deaeca737 [diff] | |
| parent | a7cb85ce8e8f696ee70d758e80e46f70cf8077d2 [diff] |
resolve merge conflicts of 743b0c5 to stage-aosp-master am: 619875061d am: a7cb85ce8e Change-Id: Ice3e018e5f116571e5dadea64a28a176d6324583