OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 232106b 0a8cf0b)
am 815b8e4a: Merge "Add emergencyOnly indicator in ServiceState." into froyo
authorJohn Wang <johnwang@google.com>
Thu, 8 Apr 2010 00:54:27 +0000 (17:54 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 8 Apr 2010 00:54:27 +0000 (17:54 -0700)
Merge commit '815b8e4ac4ddb20e8c0539ecba50c9e7382d0656' into froyo-plus-aosp

* commit '815b8e4ac4ddb20e8c0539ecba50c9e7382d0656':
  Add emergencyOnly indicator in ServiceState.


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