OSDN Git Service

am cc637ab0: am 7f2e8cdc: am 63604283: am 02e4f2fb: Merge "docs: Supported media...
authorScott Rowe <scottrowe@google.com>
Mon, 27 Apr 2015 18:30:01 +0000 (18:30 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 27 Apr 2015 18:30:01 +0000 (18:30 +0000)
* commit 'cc637ab0345759040daba736d3b1bf0687d88296':


Trivial merge