OSDN Git Service

am 5ddd9836: am 21a4ccc6: (-s ours) Merge "Add extras required for compilation" into...
authorWinson Chung <winsonc@google.com>
Mon, 29 Jun 2015 17:52:49 +0000 (17:52 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 29 Jun 2015 17:52:49 +0000 (17:52 +0000)
* commit '5ddd98364b8a66912ce75207cae11c648e828bc0':
  Add extras required for compilation


Trivial merge