| commit | a998cffb1b8dec8352fc00268d21f1983d33fb35 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Wed Jul 05 21:13:19 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Jul 05 21:13:19 2017 +0000 |
| tree | 21a4c8b3859dbb15ea2bfcabcd3ac523993896f5 | |
| parent | 1ebe18d6918cba9774698ebada7c29a499c5ece6 [diff] | |
| parent | 82537745c9a0ca1face88b07a05bc5b5de697f1d [diff] |
Merge "Merge "Cherry-pick 7ad1110ecd6a840fcd2895c62668828a1ca029c6" am: 6fd0671265 -s ours" into stage-aosp-master