OSDN Git Service

am dc87b105: am 20eb7e10: (-s ours) am 331b9823: Merge "Remove unused MediaFormat...
authorRubin Xu <rubinxu@google.com>
Thu, 27 Aug 2015 20:16:08 +0000 (20:16 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 20:16:08 +0000 (20:16 +0000)
commite94e74af749d5038802786ce8606f4c0387bf461
tree8c762641adaf526afc25ba999560dbfe888bbd1c
parentf69cef28b90ba249298abd027aa5c26d3f3bc5f3
parentdc87b1052370a4c1966dbc70856869359df37e03
am dc87b105: am 20eb7e10: (-s ours) am 331b9823: Merge "Remove unused MediaFormat activity" into mnc-dev

* commit 'dc87b1052370a4c1966dbc70856869359df37e03':