OSDN Git Service

am c341ec1d: am 033afa8c: am 661c2e74: am 33c0a616: Merge "Add text representation...
authorBryan Mawhinney <bryanmawhinney@google.com>
Mon, 29 Oct 2012 20:41:32 +0000 (13:41 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 29 Oct 2012 20:41:32 +0000 (13:41 -0700)
commitd49121f58408054526febff5fbeba2c73c68d53c
tree273dcaa4026500f0019564189a68e8a6cde0d81a
parent43de88e40f1a0be6ccd800b08a0d58c558aad6f8
parentc341ec1de532e793f99697dbcdcba9916a20f140
am c341ec1d: am 033afa8c: am 661c2e74: am 33c0a616: Merge "Add text representation of ROUTE_TYPE_LIVE_VIDEO (for debugging)" into jb-mr1-dev

* commit 'c341ec1de532e793f99697dbcdcba9916a20f140':