tree 4894ba778a43e4e9e48a841a5c4ef834808ce437
parent f889a4ecd6aa9f88b9ce16af04a65ca262547c3f
parent b0aea15c03dfd36c29c27f3451e460b0416502a2
author Tao Bao <tbao@google.com> 1474943696 +0000
committer android-build-merger <android-build-merger@google.com> 1474943696 +0000

resolve merge conflicts of bfee61b to nyc-mr1-dev-plus-aosp
am: b0aea15c03

Change-Id: I827025338d03359e4202233cc072829655b7c2b3