| commit | f20399f4242761914abc0a9ef40578f5ac017445 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Oct 03 07:36:32 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 03 07:36:32 2012 -0700 |
| tree | e23ac7508f7b595a7f700d8f635c2acbc0c3b865 | |
| parent | 01c221b40d9133bc1fd7f045de3dbfcc25dcfea7 [diff] | |
| parent | 4369a0dcc26b6298a4bba44a732b6f270a593f79 [diff] |
am 4369a0dc: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '4369a0dcc26b6298a4bba44a732b6f270a593f79':