tree c3937a78321bc572fcc2c6a95f23e0806cc3e968
parent b580027c159ca1a7fc08040c936cb8384a611998
parent 9de20d4a7ce848cec2644da6e1fa7c50b9f07830
author Tao Bao <tbao@google.com> 1471502444 +0000
committer android-build-merger <android-build-merger@google.com> 1471502444 +0000

resolve merge conflicts of 7f8dc84 to nyc-mr1-dev-plus-aosp
am: 9de20d4a7c

Change-Id: Ib79151c746f36a056a8236fedf5afb1cdc0dfcce