OSDN Git Service

Merge commit '95a7829c' into manualmerge
authorDan Sandler <dsandler@android.com>
Wed, 19 Mar 2014 16:02:51 +0000 (12:02 -0400)
committerDan Sandler <dsandler@android.com>
Wed, 19 Mar 2014 16:02:51 +0000 (12:02 -0400)
commit48b3f56cd8a3597e6ecfc5ad55d20eca182a6852
tree732fec7bc90f6591bd39e581ffa13fa9e57c7c27
parentc76bccd6ea993eb6e71baff9f5ed2f9fe67af947
parent95a7829c270fb63ce9255cc9956a3a9b778cc8a2
Merge commit '95a7829c' into manualmerge