commit | 15eaee40a19c0d7391b5f209e4336e889be43297 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Thu Sep 20 10:34:51 2012 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Thu Sep 20 10:34:51 2012 -0700 |
tree | 0afa7d4bca2d1042f1cf3085c121967de2a92815 | |
parent | 42afb5457f75cffb29a6d658fbf17961210080fd [diff] | |
parent | cda00bba51c6adbf95e451fd8c6cad7a5390503a [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: Ifa58ce936a9bf0a9e95f46eebcb4f64c772aa5ba