| commit | 69452cc8a718938316ef3f7ebf91e706dd1e4bed | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Wed Oct 03 15:31:14 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 03 15:31:14 2012 -0700 |
| tree | d9fd9dd7af6be60366317795f745e71be5727b15 | |
| parent | 6928a43b8ebb27b72213f5648c8b4fae661bfc8e [diff] | |
| parent | 807f297a7ef4572c89bb89dc07a26ae8e23b2466 [diff] |
am 807f297a: (-s ours) Reconcile with jb-dev - do not merge * commit '807f297a7ef4572c89bb89dc07a26ae8e23b2466':