tree 28e3e65a06ff331f2c75bc1dc1524e012173641a
parent 8ae5c7b6f98a5bdb7d7d1908935030aa88d89e1e
parent 86dea47ba8c4c5edcefa06cd730aaed20c29b920
author Jean-Baptiste Queru <jbq@google.com> 1363044543 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363044543 -0700

am 86dea47b: am 0327ed0d: am 0c0bad05: (-s ours) am 4aed7b07: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '86dea47ba8c4c5edcefa06cd730aaed20c29b920':