Merge changes from topic 'am-47c303cab10f49afaaaf3929a6369684' into nyc-mr1-dev-plus...
authorDaniel Xie <dxie@google.com>
Tue, 13 Sep 2016 17:46:29 +0000 (17:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 17:46:29 +0000 (17:46 +0000)
commite20de5492ed88f9ce6d563b23121ef28c97c579f
tree4dd25da15bcdd054f43af06ec9dfdcb52d9a25f2
parentc7295524bedf56e4f42c9600238fb3c8e7c6df51
parent5f034cee8b9936f7ceae33e5b3a11d9e0d192094
Merge changes from topic 'am-47c303cab10f49afaaaf3929a6369684' into nyc-mr1-dev-plus-aosp
am: 5f034cee8b

Change-Id: I01dd2d39585be5003eda6ac2e211269864a7de85