OSDN Git Service

Merge commit '9d3950389b53452338fab25f2255623ac159b259' into HEAD
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 5 Dec 2013 20:38:20 +0000 (12:38 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 5 Dec 2013 20:38:20 +0000 (12:38 -0800)
commitcf68701c3952cc2e6e258005e3cf9e38fe107ede
tree639c569cb86f8e89b9fbf2e3caf6fcb33a6b1f37
parentb8fada8742caed088c4d9f18353c557255701d2f
parent9d3950389b53452338fab25f2255623ac159b259
Merge commit '9d3950389b53452338fab25f2255623ac159b259' into HEAD