OSDN Git Service

am 6c1ef468: Merge "Avoid porting null keys when copying preferences into new system...
authorAlan Newberger <alann@google.com>
Sat, 4 Oct 2014 00:42:48 +0000 (00:42 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 4 Oct 2014 00:42:48 +0000 (00:42 +0000)
* commit '6c1ef468d480520f706efe3264c5da48238f878d':
  Avoid porting null keys when copying preferences into new system


Trivial merge