| commit | a8d29082843cc22bb37fcd88ae581affdf0eaec7 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Apr 08 13:40:40 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Apr 08 13:40:40 2013 -0700 |
| tree | b2b0a4258c47880bbd237d93de2a6c3f8616df7c | |
| parent | d17c8bd9297607e7318ad2470ae72a27b1d28ec1 [diff] | |
| parent | d5c8247fe908ddda7f8af9009565b5d9dbf41b96 [diff] |
am d5c8247f: Reconcile with jb-mr2-release - do not merge * commit 'd5c8247fe908ddda7f8af9009565b5d9dbf41b96':