OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 29 Mar 2013 16:49:17 +0000 (09:49 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 29 Mar 2013 16:49:17 +0000 (09:49 -0700)
commit357f00a1ce1f1b8584982083f8263e9283117cfa
treea31e46c5187efd56da7bb841dacc93b34a892c75
parentd75186178d4f5c89ee7339b5d1acf4f682772066
parentb8137c3b6ee231bf54d55270651d9c0d16702cf4
Reconcile with jb-mr2-release - do not merge

Change-Id: I824c53b5cb75e9076acb41d0e5385499a25f3141