OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 3 Apr 2013 23:43:09 +0000 (16:43 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 3 Apr 2013 23:43:09 +0000 (16:43 -0700)
commit0be32b1b45820b239ec2e552c28402ebf1dae866
tree4655e4cb9e5a8920035affa6a9465d3667d97249
parent9544fb1464cbd216648d3f9ba1aa03c911ff6f7b
parent3acf9c7cf020b057405235171e17241bfc434666
Reconcile with jb-mr2-release - do not merge

Change-Id: Ic6ae8074b669ad14dbebbe935e01dda773c3a58c