refs/heads/jb-mr1-dev - aosp/platform/frameworks/support - Git at Google

commit: dbd344bcb79e48cd3a27ee3aca99e7a5d5460517
[log]
author: Jean-Baptiste Queru <[email protected]>
Mon Mar 11 19:19:53 2013
committer: Jean-Baptiste Queru <[email protected]>
Mon Mar 11 19:19:53 2013
tree: 7909baf4d695b9ff2fff983fe8944cb0f9885a83
parent: 8295680249abdd0cffece49cbefb337f03425c20 [diff]
parent: dfa6440ad627b1ccbbbd00c3296e27ce2fa1bf67 [diff]

Reconcile with jb-mr1-release - do not merge

tree: 7909baf4d695b9ff2fff983fe8944cb0f9885a83