| commit | bc74447080e16c3171229231021ad5ee217b690c | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 06 12:38:06 2012 -0800 |
| committer | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 06 12:38:06 2012 -0800 |
| tree | 51bac729f7186c76f114019f891c6388dc2022b7 | |
| parent | 08ea3b10b482d4d08e59e03291d2feb3b361500d [diff] | |
| parent | 60b34f48423083e8f5988b3cbbaa1ab3f403dfb5 [diff] |
Reconcile with jb-mr1.1-release - do not merge Change-Id: I85d65e59a36ccffb027cd67848a2aebdf3cfdfe0