| commit | bf13b8923b7fad0d37b2dcccf2d4dc6b0d4ffff4 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Feb 26 14:30:41 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Feb 26 14:30:41 2013 -0800 |
| tree | 3c4191968eb4a93c6ad4f3def7192f6751bb0da8 | |
| parent | 02f3e81e9ee93848d9805222d79a4a76ea2e898a [diff] | |
| parent | 8a0dc8e13891678151d8e314a0259666835fed43 [diff] |
am 8a0dc8e1: am ee98d0ed: (-s ours) am 53ed93f3: (-s ours) Merge from jb-mr1-dev - do not merge * commit '8a0dc8e13891678151d8e314a0259666835fed43':