| commit | d4115349de4e988ceb04ce00ff016645b3761aa7 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Wed Oct 03 15:19:50 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 03 15:19:50 2012 -0700 |
| tree | fb4a2b50a6e51177cbc6c55fa82cba7dbb22f161 | |
| parent | 0b89c64fc49290f833434d42c38c127210f3a0e0 [diff] | |
| parent | 1bb422d4528c1156c4bf7535614888f0c2b5cd07 [diff] |
am 1bb422d4: am 2cb0549a: Reconcile with jb-dev * commit '1bb422d4528c1156c4bf7535614888f0c2b5cd07':