OSDN Git Service

Reconcile with jb-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 3 Aug 2012 20:23:27 +0000 (13:23 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 3 Aug 2012 20:23:27 +0000 (13:23 -0700)
commit633233bc9ec0f3961b096fea933ecaa454214fd7
tree45e751e352da4ab82842b43569233b8b1f099c5a
parent2cb7db116f738b9c88f3aeceb345cbdc99de04ce
parent0e51c94c98fe69d7183f7fccaa35c0f46fd8e3f2
Reconcile with jb-release - do not merge

Change-Id: I586debc586c0de8fc24359daa40cbee9e58340ab