OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 127d0b8 18fb1c9)
am 18fb1c92: (-s ours) am bf0652ee: DO NOT MERGE Don\'t take flags when creating...
authorSvetoslav <svetoslavganov@google.com>
Wed, 10 Jun 2015 15:51:38 +0000 (15:51 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 10 Jun 2015 15:51:38 +0000 (15:51 +0000)
* commit '18fb1c92d8c6ac732b85d7dee02a75591aec154b':
  DO NOT MERGE Don't take flags when creating app widget config activity.


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