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:35:13 +0000 (21:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 23 Oct 2015 21:35:13 +0000 (21:35 +0000)
commit5ce90247a20536091505b449a4d386c21034d842
treecf17a87325553649be202d9d15014ce54c053ba2
parent0c11f9918c6f834f12d97315ef0247c08f8fef63
parent574145ea31171a80c45f86eb231f55a2106826c4
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

* commit '574145ea31171a80c45f86eb231f55a2106826c4':
  DO NOT MERGE: fix build try #2