OSDN Git Service

am 6accdc62: (-s ours) am 05ec299c: am a539ec06: Merge "Introduce support for hardwar...
authorRoland Levillain <rpl@google.com>
Thu, 27 Aug 2015 04:19:50 +0000 (04:19 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 04:19:50 +0000 (04:19 +0000)
* commit '6accdc62becf2ef0f5795fa1e9fc5dbb984e7376':


Trivial merge