OSDN Git Service

Reconcile with jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 15 Jul 2013 16:33:36 +0000 (09:33 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 15 Jul 2013 16:33:36 +0000 (09:33 -0700)
commitf2d9e68c238d754d00fa846b4d4c6737a24595fc
tree2be7b85e24e8de6d7443cb0d72c72aa33dd8ab83
parenteeb90735dd7accfa34d77bcc8023412dab84bf9d
parentd9575910e72dda3cacfb171a447c9bfea81d3c0c
Reconcile with jb-mr2-zeroday-release - do not merge

Change-Id: Id0cd5164aa3d404463c520c3361cce521f3577fe