commit | e48e95bdfd58b73b1a3f3533e00a2928d0f133ae | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed Sep 26 10:07:39 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 26 10:07:39 2012 -0700 |
tree | 88ded1977b73276f93db557f58128bbb989171ca | |
parent | d5de3602d72ca8d59c34eeff0d5d965bd7ec111f [diff] | |
parent | 4e9fb84063a2ad84df45ade41d301ec3aaf06160 [diff] |
am 4e9fb840: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '4e9fb84063a2ad84df45ade41d301ec3aaf06160':