OSDN Git Service

DO NOT MERGE: fix build try #2 am: 778b6f4902
authorNick Kralevich <nnk@google.com>
Fri, 23 Oct 2015 04:19:51 +0000 (04:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 23 Oct 2015 04:19:51 +0000 (04:19 +0000)
commitdbc9a478311e8728c8148a80abb103fca697891d
tree287cc26a71f2a901393076ff1928104cb313af9b
parentfa632f6ad7be6b1f488dd3d1b825a82456db5097
parent034bc1799cbbc4184aa507eba181573c0a3b9b35
DO NOT MERGE: fix build try #2 am: 778b6f4902
am: 034bc1799c  -s ours

* commit '034bc1799cbbc4184aa507eba181573c0a3b9b35':
  DO NOT MERGE: fix build try #2