refs/heads/jb-mr1.1-dev - platform/frameworks/ex

commit: 129a87f9bde4bff575607ebb3ce330161200aec3
[log]
author: Jean-Baptiste Queru <[email protected]>
Mon Mar 11 12:41:48 2013 -0700
committer: Android Git Automerger <[email protected]>
Mon Mar 11 12:41:48 2013 -0700
tree: 38e7a79da20cf168bc915745e26ce95f226627e3
parent: a918fec5a1dc028e9b04a71d0e37ee1bab6caa61 [diff]
parent: 6b0409dbc4f33e4adc30390b934c930a5cda4b21 [diff]

am 6b0409db: (-s ours) am 92be9d34: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '6b0409dbc4f33e4adc30390b934c930a5cda4b21':

tree: 38e7a79da20cf168bc915745e26ce95f226627e3