OSDN Git Service

DO NOT MERGE - Fix build am: bf835e4525 am: 98b31b9270
authorRobert Shih <robertshih@google.com>
Thu, 14 Jul 2016 23:04:02 +0000 (23:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 14 Jul 2016 23:04:02 +0000 (23:04 +0000)
commit5d925fce788ddf4fe3a7146dfe144f15b7a21826
treefd3b513264c522d9b2d3b7a353f17f74e81973bf
parentd5573715d8f93aedfd8aa1db9d42d3089947858d
parent1038762b09aabc3e049b4bdb664c2c6b03008145
DO NOT MERGE - Fix build am: bf835e4525 am: 98b31b9270
am: 1038762b09  -s ours

Change-Id: I43d1bdb6bd3f432b44513687d1736fc344c68f9a