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)
commit16687c5ae5285c8b389ff8de1f68d1c62d7d8383
treeee1cb1a1dda85ff8486a3f2bac51f7590e441826
parent57b814df5ffbd8369d7bf0e80cef7e891836e6ad
parent9568bfbd4c6fe090fb1bc1a55b6d953a60da3fff
resolve merge conflicts of 6471f22 to nyc-mr1-dev-plus-aosp
am: 9568bfbd4c

Change-Id: Ie5b9bd12de4d17bf124745c79bc9893f1c03e110