| commit | e28766a49c1460ae787d992041c297acea75dadb | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Jun 12 18:06:08 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 12 18:06:08 2013 -0700 |
| tree | 69ff54d52660696cb2581aed2834bfd35993be9c | |
| parent | fa1d3cae582c1d26a0e2f977a04e280490d99b27 [diff] | |
| parent | e14bee15e5bb044f38da38ef00d3530a326f07a5 [diff] |
am e14bee15: (-s ours) Reconcile with jb-mr2-release - do not merge * commit 'e14bee15e5bb044f38da38ef00d3530a326f07a5': Redefine content position in milliseconds instead of seconds. Update the SDK API Data. Update media router api.