OSDN Git Service

am 84f7a5b2: (-s ours) am 9ec86fa0: am a577eefb: am 5be9c1da: am 01eed3c0: am 7a107b8...
authorMarco Nelissen <marcone@google.com>
Thu, 20 Mar 2014 23:12:54 +0000 (23:12 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 20 Mar 2014 23:12:54 +0000 (23:12 +0000)
* commit '84f7a5b28a686f9a165e1df5c90a72b218a87568':
  Fix build


Trivial merge