OSDN Git Service

am 5aa2fe13: (-s ours) [DO NOT MERGE] Build fix.
authorSunny Goyal <sunnygoyal@google.com>
Mon, 29 Jun 2015 17:41:17 +0000 (17:41 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 29 Jun 2015 17:41:17 +0000 (17:41 +0000)
* commit '5aa2fe13b5c5f7d34f653e70943b45e0231c5d09':
  [DO NOT MERGE] Build fix.


Trivial merge