OSDN Git Service

am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage...
authorJon Larimer <jlarimer@google.com>
Sat, 31 Jan 2015 03:39:19 +0000 (03:39 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 31 Jan 2015 03:39:19 +0000 (03:39 +0000)
automerge: 9e7e8af

* commit '9e7e8afbb934742cb7996b22e32f94c1c09704af':


Trivial merge