OSDN Git Service

Merge commit 'afd0debe4bdf47dc0f968282ca1261842bb65d60' into HEAD
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 22 Nov 2013 19:20:20 +0000 (11:20 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 22 Nov 2013 19:20:20 +0000 (11:20 -0800)
commitfc3cdb936e6b34257a3bfaf30e89db8f11667cc5
tree4eb3500004e152440074ae85e31d61148fb51cd8
parentf2f74ca65f34ae0cae6f0cca40f1c18aa771739d
parentafd0debe4bdf47dc0f968282ca1261842bb65d60
Merge commit 'afd0debe4bdf47dc0f968282ca1261842bb65d60' into HEAD

Change-Id: Ic9aed2c57bdfeb250ce2dd7f0e9289ba5b6e936a