tree 0b491d65092cfa935a9ddfd155067594d6f5988c
parent 5f9d7749e9d80370b2eaf00597c8a704b24dd569
parent 9b15ba8269f7a2cb63ac31185fcbb17c86236f99
author Yabin Cui <yabinc@google.com> 1467327319 +0000
committer android-build-merger <android-build-merger@google.com> 1467327319 +0000

resolve merge conflicts of 2f272c0 to nyc-mr1-dev-plus-aosp
am: 9b15ba8269

Change-Id: Idca52296ddcb318a23f1fb279435a1f71751afec