commit | e1e9db52f8df0681114665b56368f7b19449ee33 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 06 12:24:41 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 06 12:24:41 2012 -0800 |
tree | 2bf61e5bf7a3cb252c3f9703912bde83bf9240bb | |
parent | 98ee7b8a5eb2c89439d7cdab914cc7b3d862f8b0 [diff] | |
parent | 322b973788ce7eeed8c08fbfa77a93fe43f803c2 [diff] |
am 322b9737: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit '322b973788ce7eeed8c08fbfa77a93fe43f803c2':