| commit | 160a22b8fbc2c25cb893e92fcad2db8fc26e24b2 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Apr 15 10:46:31 2013 -0700 |
| committer | The Android Open Source Project <initial-contribution@android.com> | Mon Apr 15 10:46:31 2013 -0700 |
| tree | 481a7ba5658263826c37e105596972cc03f00aca | |
| parent | d45dcbd5f825dfde943791c1fb5eaa27e1fc02f5 [diff] | |
| parent | d8c0d8dcbd562e8facb5aa584ed5ddca96e790c1 [diff] |
Reconcile with jb-mr2-release - do not merge Change-Id: I5bcebe96be1d96d4e9f694eef967ca076310cfa1