| commit | e88b60b61d85172ccd575f9697978a22f646afb8 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Dec 05 11:08:42 2012 -0800 |
| committer | The Android Open Source Project <initial-contribution@android.com> | Wed Dec 05 11:08:42 2012 -0800 |
| tree | e9943ae9408c48452a7d13f588c7cf155227431e | |
| parent | 6ada476bab047fb4a8df257655981f01b92ecd6d [diff] | |
| parent | d2f1fd57636f462171fa51cc7ff71b8b9cb95e8e [diff] |
Reconcile with jb-mr1.1-release - do not merge Change-Id: I103bde3c4149cc42d5cdc5290cdace12f30efc1a