OSDN Git Service

Reconcile with jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 19 Jul 2013 21:20:43 +0000 (14:20 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 19 Jul 2013 21:20:43 +0000 (14:20 -0700)
commitc02fcf81462346ee6fe3fca8eb4594344b13ddf7
treed52927f561b6dfea60262979d68b433c61509c3d
parentb9aa1789ee221c45bd3c01bae4ae99d7965c1437
parenta34a64d2b1df270331cfe9817f59e875b3298aca
Reconcile with jb-mr2-zeroday-release - do not merge

Change-Id: I1d7f0e0f6a4cb8b9363c99a830dc1656424ad49d