OSDN Git Service

DO NOT MERGE: fix build try #2 am: 778b6f4902 am: 034bc1799c -s ours am: dbc9a47831...
authorNick Kralevich <nnk@google.com>
Fri, 23 Oct 2015 21:40:03 +0000 (21:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 23 Oct 2015 21:40:03 +0000 (21:40 +0000)
commitfd84a642ff1e6b30fe5c5adb623cc9e2addbb712
treecf17a87325553649be202d9d15014ce54c053ba2
parentbcc709b94d72e7f2d03d952dbf8a21b6980fd3a9
parent5ce90247a20536091505b449a4d386c21034d842
DO NOT MERGE: fix build try #2 am: 778b6f4902 am: 034bc1799c  -s ours am: dbc9a47831  -s ours am: a2685ebb1e am: 1d94a1d036  -s ours am: bce101e79b am: 574145ea31
am: 5ce90247a2

* commit '5ce90247a20536091505b449a4d386c21034d842':
  DO NOT MERGE: fix build try #2