tree 05e7642b26601ba2960af42f2ac1ae4f09ed9b5b
parent 264bdeb6f25ca67a9993ae1cd78b987a3e44d30a
parent 74b56a8e0d5c4aabd7df4d79589f93b23d8fae89
author Robert Shih <robertshih@google.com> 1471895190 +0000
committer android-build-merger <android-build-merger@google.com> 1471895190 +0000

resolve merge conflicts of 77da968 to nyc-dev-plus-aosp am: 168e16423f
am: 74b56a8e0d

Change-Id: I9362d65ceb9d545d68ac228593e8184b4b4e51c4