tree 34049eab3dcc3b498de99ec186881bbaff483824
parent e0c8f22188026985f304bc28da6fb41d3bffb517
parent 810a72954efcd36cf55c70e251c3c7a0c2c15b62
author Jean-Baptiste Queru <jbq@google.com> 1363029779 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363029779 -0700

am 810a7295: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '810a72954efcd36cf55c70e251c3c7a0c2c15b62':