OSDN Git Service

am 5d8961e7: am 507ea24b: am ffdc7aed: Merge "avoid crashing system serer process"
authorAmith Yamasani <yamasani@google.com>
Sat, 15 Dec 2012 23:15:23 +0000 (15:15 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 15 Dec 2012 23:15:23 +0000 (15:15 -0800)
* commit '5d8961e75685674f46ca376ea8ea13ce02dd292b':
  avoid crashing system serer process


Trivial merge