OSDN Git Service

am 4c418d61: (-s ours) am 591ab58d: DO NOT MERGE - Move localstorage into private...
authorJohn Reck <jreck@google.com>
Tue, 25 Jan 2011 20:58:30 +0000 (12:58 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 25 Jan 2011 20:58:30 +0000 (12:58 -0800)
* commit '4c418d6168b93e442dfcff7da1a4b7233a630f6d':
  DO NOT MERGE - Move localstorage into private folder


Trivial merge