tree 9889be2beae66dbb104d0dd3eac32c096eae2f7b
parent 07eb28f1a1ece6d14bb31ca5d797d5a8a1bbfac7
parent c5adba2e2ae6024010d7e4b4bc622df630b484da
author Jean-Baptiste Queru <jbq@google.com> 1349302746 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349302746 -0700

am c5adba2e: (-s ours) Reconcile with jb-dev - do not merge

* commit 'c5adba2e2ae6024010d7e4b4bc622df630b484da':