OSDN Git Service

am 56700e24: (-s ours) am d7255cfb: Merge "DO NOT MERGE. Add new media navigation...
authorMichael Wright <michaelwr@google.com>
Thu, 27 Aug 2015 10:08:44 +0000 (10:08 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:08:44 +0000 (10:08 +0000)
* commit '56700e24b4ea68701589ff731a3397fa8ee47ca8':


Trivial merge