Merge changes from topic 'am-3e509cc2c5f147e5b2d84c53284e013e' into nyc-mr2-dev-plus...
authorXin Li <delphij@google.com>
Fri, 13 Jan 2017 00:25:53 +0000 (00:25 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 13 Jan 2017 00:25:53 +0000 (00:25 +0000)
commit9332507f291deb6b9fdbc00ade4508a3a51ebdb1
tree57c6c496041e787593e6de62e94d2c88fae4c188
parent6520707bb886c356e1e86d304c6fba843e7e5e81
parent52ad7b00227fda438f73db992a0ac1e3d211fa6c
Merge changes from topic 'am-3e509cc2c5f147e5b2d84c53284e013e' into nyc-mr2-dev-plus-aosp
am: 52ad7b0022

Change-Id: I1869c9522b4ed8229afc1e39ba4e53e7d017c227