OSDN Git Service

DO NOT MERGE: fix build try #2 am: 778b6f4902 am: 034bc1799c -s ours
authorNick Kralevich <nnk@google.com>
Fri, 23 Oct 2015 04:26:03 +0000 (04:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 23 Oct 2015 04:26:03 +0000 (04:26 +0000)
commita2685ebb1ec5ed523fb4800d2593f2ae0c10ed22
treef8659c6433a0d49cfd756c4a72a9bd967ab455f2
parent9ec978732f8dd82e7adef3e37097eaca3fbd65f0
parentdbc9a478311e8728c8148a80abb103fca697891d
DO NOT MERGE: fix build try #2 am: 778b6f4902 am: 034bc1799c  -s ours
am: dbc9a47831  -s ours

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