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 04:32:47 +0000 (04:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 23 Oct 2015 04:32:47 +0000 (04:32 +0000)
am: a2685ebb1e

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


Trivial merge