| commit | 4ffaa760894edab4a4b09b251a4dfb10d76bd24d | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Thu Jun 30 02:15:08 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jun 30 02:15:09 2016 +0000 |
| tree | 8d3a8606cb7c361a9c5618a902154fc5a590da06 | |
| parent | 16647a26f0891cbec2de8a0d758eb8095886ea7f [diff] | |
| parent | d599cd70e2c96c74b5ee2974c4f3dd6dbd8330e0 [diff] |
Merge "Merge \\"Fix Windows NDK labeling.\\" into nyc-dev am: d1364cf0f1 am: 0ca5ae5208" into nyc-mr1-dev-plus-aosp