OSDN Git Service

am 53aa7d80: am b0127aad: am 69412a51: am c4bd7211: resolved conflicts for 7534e4e6...
authorNaveen Leekha <leekha@google.com>
Thu, 24 Sep 2015 23:55:17 +0000 (23:55 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 24 Sep 2015 23:55:17 +0000 (23:55 +0000)
commitbac4a44ac909dbf09ce7a25bd2173164fc437c74
treea255e7b27ef6f6b363f16d6f60081d44fa98ec87
parentb062a7a10d014c30f2c59761010fa4e4f876e85c
parent53aa7d80cf64f2f2c0c935be8528a513b32341b2
am 53aa7d80: am b0127aad: am 69412a51: am c4bd7211: resolved conflicts for 7534e4e6 to lmp-mr1-ub-dev

* commit '53aa7d80cf64f2f2c0c935be8528a513b32341b2':
  resolved conflicts for 7534e4e6 to lmp-mr1-ub-dev