summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2012-07-30 14:44:34 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2012-07-30 14:44:34 -0700
commit01eee16d68a9bc6f5cbadcecf182422635b5728c (patch)
treefe6c0dd70a2100db0838feaf2c7152d562ef353c
parent1a45a21fa89c42f499bb765c29dea7a85ba157f5 (diff)
parent799109ac805f1580389597c186afccdba7ab718c (diff)
parentb411561dbf55987b42f9d578c266ea4a6081c27d (diff)
Reconcile with jb-mr0-release jb-release
Change-Id: I9ec8ca5435e26340245ffe6d5408b61376eedb63