OSDN Git Service

Merge commit '04b4339ad5396690329877df10fbe568bd4dd600' into HEAD
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 5 Dec 2013 20:37:57 +0000 (12:37 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 5 Dec 2013 20:37:57 +0000 (12:37 -0800)
commit3377165387d455d4cb56807a9c02cd2ece6cb24b
treec031e82ae3400ce97aa416185c9118812569434c
parent6afe8ab7533937c7444756ae72dda547b9849fe2
parent04b4339ad5396690329877df10fbe568bd4dd600
Merge commit '04b4339ad5396690329877df10fbe568bd4dd600' into HEAD