summaryrefslogtreecommitdiffstats
path: root/libcutils
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2012-10-15 07:40:44 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2012-10-15 07:40:44 -0700
commit133155e3d825266900c9bf9464163f27faf69838 (patch)
tree01711f1d37d3c6b2f47b7ebbf124a0f31e6fc489 /libcutils
parent1dcaf9d054bf92a17d82160865bba5c6f7d15adb (diff)
parentb151510bee9d81f164b13a4a2b460465285ea836 (diff)
parenta26ee499a7d20c4ae86851aff1d9792c5855c5b4 (diff)
downloadsystem_core-133155e3d825266900c9bf9464163f27faf69838.zip
system_core-133155e3d825266900c9bf9464163f27faf69838.tar.gz
system_core-133155e3d825266900c9bf9464163f27faf69838.tar.bz2
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: Ie75896ec89b34fe067a2d1c6b34309629459228b