| commit | 5a4f4732967c7d035eefff50092186f8d3ed05b4 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Wed Oct 03 15:30:19 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 03 15:30:19 2012 -0700 |
| tree | 44bcce495cb9b4e5865b481b41ef3e884b721726 | |
| parent | c02806801e56ec670c09f31ff13ceb1bf0035c16 [diff] | |
| parent | 4177ffd2ab90fb8b5d5d68b804ec1916fd656d8c [diff] |
am 4177ffd2: (-s ours) am 992b10f4: (-s ours) Reconcile with jb-dev - do not merge * commit '4177ffd2ab90fb8b5d5d68b804ec1916fd656d8c':