commit | 07ccf49f7a9da07ce1e87d567c7f42466bfb158e | [log] [tgz] |
---|---|---|
author | Dan Albert <danalbert@google.com> | Thu Jun 30 02:25:19 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jun 30 02:25:19 2016 +0000 |
tree | b84f830d3c43115002aaa19d9d00acbaca4229be | |
parent | ec03aeed405d57cbad7da798b7ed063f40d1c98e [diff] | |
parent | 4ffaa760894edab4a4b09b251a4dfb10d76bd24d [diff] |
Merge \"Merge \\\"Fix Windows NDK labeling.\\\" into nyc-dev am: d1364cf0f1 am: 0ca5ae5208\" into nyc-mr1-dev-plus-aosp am: 4ffaa76089 Change-Id: I5750bda6be344e554f3fece69edc86f7143c4982