summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2013-06-06 10:37:03 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2013-06-06 10:37:03 -0700
commitedb073efd3c4cee5595f5692b22a69a1e3bc89fe (patch)
treed0c2797379a505fc33b006c36036df0454847cf7
parentce4f740ce0a376c6d2942d8fb99acec2c3a864ad (diff)
parent4ff83db4ab46c0d997d0ca966fc6c94531e6b784 (diff)
parent76852898612aca637dc6726b6c11672f31b9d6e3 (diff)
downloaddevice_generic_goldfish-edb073efd3c4cee5595f5692b22a69a1e3bc89fe.tar.gz
device_generic_goldfish-edb073efd3c4cee5595f5692b22a69a1e3bc89fe.tar.bz2
device_generic_goldfish-edb073efd3c4cee5595f5692b22a69a1e3bc89fe.zip
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
Change-Id: Ie82b1c1ca10b0d4e25b06ec917e23a3703177d5b