summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2012-11-06 12:17:20 -0800
committerThe Android Open Source Project <initial-contribution@android.com>2012-11-06 12:17:20 -0800
commitd8e8e66220cd71486a3b545096a1cdc298dee5fd (patch)
tree3d6d537b1187b7cb79d36ba395d1fe3f446a3042
parent02b95105754b1859a97e234b79f41489a4677c20 (diff)
parent4ea5d656db0f5fcc4ae6c792ec83e157a2c1bae8 (diff)
parentf67623632a545bd9ca1d8afefc3dd0789eaba6b3 (diff)
downloadframeworks_native-d8e8e66220cd71486a3b545096a1cdc298dee5fd.zip
frameworks_native-d8e8e66220cd71486a3b545096a1cdc298dee5fd.tar.gz
frameworks_native-d8e8e66220cd71486a3b545096a1cdc298dee5fd.tar.bz2
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: I219247f1b0f5d87b4144dc1535039e93fc636a94