| commit | 94c31c85f67ff10a1ea496ce9ea12809174f72c0 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Feb 26 14:33:30 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Feb 26 14:33:30 2013 -0800 |
| tree | 1e16fcbb56da6cf69c3d44738cfcc0c949312bc6 | |
| parent | a18ff6f1ae45c4553e7d2e0c65a5b347bbb370e4 [diff] | |
| parent | d4ed4363101201ed24795f50064fe76cb754f979 [diff] |
am d4ed4363: (-s ours) am 909960ad: (-s ours) am ed9cc555: Reconcile with jb-mr1-release - do not merge * commit 'd4ed4363101201ed24795f50064fe76cb754f979':