OSDN Git Service

resolve merge conflicts of 95e42d9 to nyc-dev-plus-aosp am: 289688de68
authorDavid Gross <dgross@google.com>
Thu, 21 Jul 2016 22:25:38 +0000 (22:25 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 21 Jul 2016 22:25:38 +0000 (22:25 +0000)
commit284bc822dbd15a07e7eef0c85c7a97113b15aa86
treef0545157d25e8b536a2889c07650e96cdf7156ae
parenta9403ac3968f89e66cac93afd93b8d4d05b9dac0
parent619fa2673f284168555201ee27f5364e0c3dcd15
resolve merge conflicts of 95e42d9 to nyc-dev-plus-aosp am: 289688de68
am: 619fa2673f

Change-Id: Id9c94a0b2b3b0b89e297a7bc7dddc0b5a51aede5