OSDN Git Service

Merge commit 'f9ca318a3d2aceaf5c9e54610073a9017442be9b' into HEAD
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 5 Dec 2013 20:38:23 +0000 (12:38 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 5 Dec 2013 20:38:23 +0000 (12:38 -0800)
commitb568548747c9b137d7da05fcdbb84f157273b3db
tree5e2274dd74642f2bf25f9dc816633491b9090afe
parente10f8528220fc4506ff6deee5c71ddab3da5e21d
parentf9ca318a3d2aceaf5c9e54610073a9017442be9b
Merge commit 'f9ca318a3d2aceaf5c9e54610073a9017442be9b' into HEAD