summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2013-04-15 10:45:58 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2013-04-15 10:45:58 -0700
commitec3063da41e25b2f65b7da592f9d779245f54f14 (patch)
treed322c90ebf252699e402419308d503689cfbf77f
parent48af42228af50677d3f083d2e3e0513b4b11355d (diff)
parentb08d95e4f4b727a8bcf49db8a2198c18ee0c6919 (diff)
downloadtoroplus-ec3063da41e25b2f65b7da592f9d779245f54f14.tar.gz
Reconcile with jb-mr2-release - do not merge
Change-Id: I9c2c56c767d1ba2873e7eddbb4fe14793bdb8ae8
0 files changed, 0 insertions, 0 deletions