| commit | 3cf221b9a75d9e4f28bd1107090a8997c01b8df6 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Mon Jul 24 17:18:26 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Jul 24 17:18:26 2017 +0000 |
| tree | d5923d0aa10137539f20ed1b8c2d4d7a05e4e10e | |
| parent | 74b28c0ac99bb8835e986dced70113aa055d1fa4 [diff] | |
| parent | f5205b5d86320110b03986df165b57760ea2c22d [diff] |
Merge "Merge "Fix potential build break" into oc-dev am: 7740a78495 -s ours am: 1a614a0856 -s ours am: 76c0e76413 -s ours" into oc-mr1-dev-plus-aosp