OSDN Git Service

Merge commit 'da6d9776befd7f03cd863654c03327806025f8b6' 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)
commit148552a0ef3777eccfbcff2297561a4c755c8777
treea6cedf66f61d6971059d19eff7347a8b68fdcb54
parentc4cffe22f0bab96a672782a9bd2d24018c01d90d
parentda6d9776befd7f03cd863654c03327806025f8b6
Merge commit 'da6d9776befd7f03cd863654c03327806025f8b6' into HEAD