OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
36ddd7d
702d4d5
)
Merge changes from topic 'wrong_password' into oc-dr1-dev
author
Peter Qiu
<zqiu@google.com>
Fri, 23 Jun 2017 18:31:08 +0000
(18:31 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 23 Jun 2017 18:31:08 +0000
(18:31 +0000)
am:
702d4d56fe
Change-Id: I827bed9cd0c57abb33c91af05a089f8f2f5d59fb
Trivial merge