OSDN Git Service

am 611793d6: merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 9 Jul 2010 17:49:04 +0000 (10:49 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 9 Jul 2010 17:49:04 +0000 (10:49 -0700)
commit4918d4cb0c4b7ea3c6ca8a5e1bc5c85a8a1efba3
treec5aebba625a7b87fbb3314e56cae9419a4c2ada9
parent312d86493c374e7456962f9f1bcb2df0dda3fc74
parent611793d6abcf504544d6ebccb8c46da06464b701
am 611793d6: merge from open-source master

Merge commit '611793d6abcf504544d6ebccb8c46da06464b701'

* commit '611793d6abcf504544d6ebccb8c46da06464b701':
  Fix missing NL