tree 37bc621e020b758a6ec056f7ec0b5057ca146282
parent b32823b7e74e5cb7cd5bb4e6d01e60383696ded8
parent 53c34ebdc41e1db7c1e4a1998b7376a0dc9cae9a
author Tianjie Xu <xunchang@google.com> 1469674208 +0000
committer android-build-merger <android-build-merger@google.com> 1469674208 +0000

Resolve merge conflicts of 286848e to stage-aosp-master am: 9da825940d
am: 53c34ebdc4

Change-Id: I54f74a04eb36317bc306fd1db20d4d4fb8a9421e