OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a5f89b1 e5cebf7)
Merge "Fix flag value collision" into nyc-dev
authorJohn Reck <jreck@google.com>
Thu, 21 Apr 2016 23:30:10 +0000 (23:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 21 Apr 2016 23:30:10 +0000 (23:30 +0000)
am: e5cebf7aaa

* commit 'e5cebf7aaa1a1eaa16bbb8b039a572e19e0a5542':
  Fix flag value collision

Change-Id: I3e37e772474b2a8d37d2bb4dcea41daa46e23c69


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