tree a71287364e954443f8755db02c401234ff7b1899
parent e7b977d56e463cf75fe05e6a7ca88fb3d1ec7ebb
parent b49dd83efcf953dc99046470e9340f7876ef5764
author Josh Gao <jmgao@google.com> 1484787098 +0000
committer android-build-merger <android-build-merger@google.com> 1484787098 +0000

Merge changes from topic 'am-295882f6444845b0a2bcae920cb1f84d' into nyc-mr2-dev-plus-aosp
am: b49dd83efc

Change-Id: Icbebc83c2cc09d958be51e64d9bba54f67ef6304