OSDN Git Service

resolve merge conflicts of 2abbbd0 to nyc-mr1-dev-plus-aosp
authorBaligh Uddin <baligh@google.com>
Fri, 24 Jun 2016 02:54:37 +0000 (02:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 24 Jun 2016 02:54:37 +0000 (02:54 +0000)
commit78122829288a1a300829bdc24cdb3762d6e7c12e
treec28920e0a258defd9aea5483601200d31445bd6c
parent02d63ef3cd516c524f369952c0f5e9c7f571dade
parentb79e31756b979462294632f1a1e61ce52b833206
resolve merge conflicts of 2abbbd0 to nyc-mr1-dev-plus-aosp
am: b79e31756b

Change-Id: Iae9c2dca0127326a4aa04a1bc7703f59ea217aa6