From: The Android Open Source Project Date: Mon, 5 Nov 2012 22:21:29 +0000 (-0800) Subject: Reconcile with jb-mr1-release - do not merge X-Git-Tag: android-x86-7.1-r1~64^2~10^2~96^2~223 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=3f88803dc0d2aebf408dd12860ef101ef79df534;p=android-x86%2Fpackages-apps-Gallery2.git Reconcile with jb-mr1-release - do not merge Change-Id: I2e4981ca363238eaffef17b801ee9f48ce68d7a4 --- 3f88803dc0d2aebf408dd12860ef101ef79df534