| commit | 7ae5a9d9e9f2db317f42ec1fc203c565fd437c51 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Jun 12 07:25:54 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 12 07:25:54 2013 -0700 |
| tree | e092129a35732c52c1880f92cfc3bb7126964111 | |
| parent | 4efee167e0a1daf750f4a466db716213c1189bb2 [diff] | |
| parent | ca70fd763174361aa9ed25241f94d52f94ef6387 [diff] |
am ca70fd76: (-s ours) Reconcile with jb-mr2-release - do not merge * commit 'ca70fd763174361aa9ed25241f94d52f94ef6387': ignore invlaid play position update from remote control client.