tree af8500a155ab76d5d7ad3afa47035304beac159e
parent d25351da83432249780050e4766f1750f31f5577
parent b5de6a20a71bc39f9e48535fb7c351e91561bf87
author Tianjie Xu <xunchang@google.com> 1462213910 +0000
committer android-build-merger <android-build-merger@google.com> 1462213910 +0000

resolve merge conflicts of 5823dd4 to nyc-dev-plus-aosp am: cacb47b2a3
am: b5de6a20a7

* commit 'b5de6a20a71bc39f9e48535fb7c351e91561bf87':

Change-Id: I62f47baf6c146879270de240c619c59cff8261ee