OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3430959 e1b573a)
am e1b573a3: (-s ours) am b4151b29: (-s ours) Merge "DO NOT MERGE Add API for file...
authorGeremy Condra <gcondra@google.com>
Tue, 12 Jun 2012 00:47:16 +0000 (17:47 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 12 Jun 2012 00:47:16 +0000 (17:47 -0700)
* commit 'e1b573a32b3c381dd2d0fd90f3d1cce7d5719ca9':
  DO NOT MERGE Add API for file origin policy.


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