OSDN Git Service

Merge commit '38ef95e0802868a39ab33bcb279e20a21ec41fd8' into HEAD
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 5 Dec 2013 20:38:22 +0000 (12:38 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 5 Dec 2013 20:38:22 +0000 (12:38 -0800)
commitbb23e198873a6e63c34b52fe3d1f12d3e5d13a2c
treec4dcdc2d78827d04e6ef53a6ce0b91fea45e8731
parentb269d503712d9f214297ef7dcf5991745626b675
parent38ef95e0802868a39ab33bcb279e20a21ec41fd8
Merge commit '38ef95e0802868a39ab33bcb279e20a21ec41fd8' into HEAD