tree a04667a27b2b2a212cf6326179b9583355b53edb
parent 21fddc5f27b9d2841736a98a9f39e2651c50606d
parent c33bb3e4306f9f56558efff10eac1ba2810f9657
author Jean-Baptiste Queru <jbq@google.com> 1363030916 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363030916 -0700

am c33bb3e4: (-s ours) am 675c10a9: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'c33bb3e4306f9f56558efff10eac1ba2810f9657':