| commit | 91713500f60c6bb1a6c7fba1e1981a394eb70950 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 13:13:53 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 13:13:53 2013 -0700 |
| tree | b59d6a750d1a45eca77e6be2143fc9668d50fece | |
| parent | a3fa668449c8009bbfa764de597a130d9f0f682f [diff] | |
| parent | 10487ceec5cb758caa0900b84b655b6fb89fdcd3 [diff] |
am 10487cee: am fc18d9ad: am 8c922479: (-s ours) am 79c111c5: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '10487ceec5cb758caa0900b84b655b6fb89fdcd3':