commit | fb2188d1390841285181256a0ec37c5558c971da | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed Aug 14 12:06:41 2013 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Wed Aug 14 12:06:41 2013 -0700 |
tree | 22aad4ace3dac8be6de4644dcf90f400dcc16784 | |
parent | 396fd67d7a691a1226783f1b15442af86137eb3d [diff] | |
parent | ec6101c2c98a21f6c8298e0ca5274870028fbea7 [diff] |
Reconcile with jb-mr2-release - do not merge Change-Id: I61c47285d236337a033e001c3b84a9631895bc5b