tree 8e3702d41bc762892e6bae852c94af2adfe7dcfe
parent 6af3b5a0c78d83c5293332726b2b0c05632aeacf
parent 735bb46ff5869a86418ba5d856b0f868d6626b04
author Meng Wang <mewan@google.com> 1481330105 +0000
committer android-build-merger <android-build-merger@google.com> 1481330105 +0000

Merge changes from topic 'am-c0ec5f28a7be4becb812fcd1d98e341c' into nyc-mr2-dev-plus-aosp
am: 735bb46ff5

Change-Id: I20d6ccd78e04797690030acb7ef0d6b41fa6b08f