| commit | 16332c296fb1ce11f1e98aacde62e345a8d967cb | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Oct 05 08:20:54 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 05 08:20:54 2012 -0700 |
| tree | b98e9ac8f46afb73da848d01570050398377b5bd | |
| parent | c695c28f158f1527ea0476094aea41067840f8f5 [diff] | |
| parent | bd98fec2ab633eb81102b3424ba258b24876e887 [diff] |
am bd98fec2: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'bd98fec2ab633eb81102b3424ba258b24876e887':