OSDN Git Service

am 5d07648b: am 26653bad: Fix build.
authorNarayan Kamath <narayan@google.com>
Fri, 14 Nov 2014 19:19:40 +0000 (19:19 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 14 Nov 2014 19:19:40 +0000 (19:19 +0000)
* commit '5d07648b367319b2da322acc58e3e6157bf912f2':
  Fix build.


Trivial merge