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:22:14 +0000 (21:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 23 Oct 2015 21:22:14 +0000 (21:22 +0000)
am: bce101e79b

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


Trivial merge