| commit | 68fa5114fe56297763a50a9090793eaae300aaa2 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Mar 04 11:07:07 2013 -0800 |
| committer | The Android Open Source Project <initial-contribution@android.com> | Mon Mar 04 11:07:07 2013 -0800 |
| tree | 3dea5602dac6ecbd90dcc2ce86cd686ad9de1a8e | |
| parent | d1439a7f8eb228eb39dd74845a5e46d20c63b3b0 [diff] | |
| parent | 6d89621266d222e6de585940058fb6d426dcb0e5 [diff] |
Reconcile with jb-mr2-release - do not merge Change-Id: I20987b51211410332c427eb876334b0c6a9bcc32