| commit | 5f09d40a633b06515a02623787888632b278a283 | [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 | b7cd59e73c72d0e2a78e3da7c9bc1490e5cfcb65 [diff] | |
| parent | a545941e6c21636a6bbccd9217b37ebe1a317b6d [diff] |
resolve merge conflicts of 743b0c5 to stage-aosp-master am: 619875061d am: a7cb85ce8e Change-Id: Ice3e018e5f116571e5dadea64a28a176d6324583