OSDN Git Service

DO NOT MERGE - Fix build am: bf835e4525 am: 98b31b9270 am: 1038762b09 -s ours am...
authorRobert Shih <robertshih@google.com>
Thu, 14 Jul 2016 23:09:06 +0000 (23:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 14 Jul 2016 23:09:06 +0000 (23:09 +0000)
commitcd349da1c231d29ad72e3f5da0584dd5ebb60b32
tree90963cfee9c39f6029a4b1f3de127e1890709812
parent047fb889cc6c74df4b838510483a8218fa2226de
parent0576ffb637b638535e9de33eb0ed9657c0122b46
DO NOT MERGE - Fix build am: bf835e4525 am: 98b31b9270 am: 1038762b09  -s ours am: 5d925fce78  -s ours
am: 0576ffb637

Change-Id: Ieab310032dbf29bab829c7b01225d84fd3df354c