OSDN Git Service

resolve merge conflicts of 6471f22 to nyc-mr1-dev-plus-aosp
authorBadhri Jagan Sridharan <badhri@google.com>
Fri, 15 Jul 2016 18:29:00 +0000 (18:29 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 15 Jul 2016 18:29:00 +0000 (18:29 +0000)
am: 9568bfbd4c

Change-Id: Ie5b9bd12de4d17bf124745c79bc9893f1c03e110


Trivial merge