OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 267b602 bffe377)
am bffe377b: Merge "Add logic to handle changes to file_contexts during update."...
authorGeremy Condra <gcondra@google.com>
Mon, 15 Apr 2013 23:13:56 +0000 (16:13 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 15 Apr 2013 23:13:56 +0000 (16:13 -0700)
* commit 'bffe377bca3cb8240bfc614c12fd1091ae3f69b9':
  Add logic to handle changes to file_contexts during update.


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help