diff options
author | The Android Open Source Project <initial-contribution@android.com> | 2012-11-06 12:17:51 -0800 |
---|---|---|
committer | The Android Open Source Project <initial-contribution@android.com> | 2012-11-06 12:17:51 -0800 |
commit | 7b5bfdf7e98bea506db5554be1e1b3d267d8bfc1 (patch) | |
tree | 9be9526eddbc4d94771e034c6377e776323303d3 | |
parent | 85c4f329001b9837f4ad9e6ef9fdf68c2d1eb6bd (diff) | |
parent | 6c8420414ab790d85d7dc4bbbf49f389592ca9b0 (diff) | |
parent | 548fbbd0c596c1ec1bd4527de6ed839f509d1be8 (diff) | |
download | libcore-7b5bfdf7e98bea506db5554be1e1b3d267d8bfc1.zip libcore-7b5bfdf7e98bea506db5554be1e1b3d267d8bfc1.tar.gz libcore-7b5bfdf7e98bea506db5554be1e1b3d267d8bfc1.tar.bz2 |
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: I1e5f377e655f72b8d2e497e83cf4207f5b786e01