| commit | 3eeee89ed1a40bfee1f1f31d60a6ff3c659ab3b2 | [log] [tgz] |
|---|---|---|
| author | Tri Vo <trong@google.com> | Wed Jan 24 20:18:54 2018 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jan 24 20:18:54 2018 +0000 |
| tree | f3ff93eca1ac05e65d7b6be7d4f0b843e39bdbfb | |
| parent | 354e9d77cfb8ba513f59f4d653b81bf09adfecdc [diff] | |
| parent | ded265a0e07b90e12e7df621e72357dbfd3a9ee5 [diff] |
Merge remote-tracking branch 'aosp/upstream-master' am: 7a190cd28b am: ded265a0e0 Change-Id: I2e8161a178eb1958f629f16302b69c78efdbcf3d