resolve merge conflicts of 25a0b43 to nyc-mr1-dev
authorPavel Zhamaitsiak <pavelz@google.com>
Mon, 2 May 2016 23:24:03 +0000 (23:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 2 May 2016 23:24:03 +0000 (23:24 +0000)
commit835f7ce9660aab4c51a4fdef37434e3141b878c0
treee525501e883f914f8c3963e83ecd5b9843af50a8
parent658e0c501bd3c20a400915b1e0b99fc95533c904
parent06903de6961de032beb3cd5d0a32983ca21f1cca
resolve merge conflicts of 25a0b43 to nyc-mr1-dev
am: 06903de696

* commit '06903de6961de032beb3cd5d0a32983ca21f1cca':

Change-Id: Ide5320f789c3f1b92e11b5de7a7c5c271bce05ad