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:
429c5b9
6ae3fe1
)
Merge branch \'stage-aosp-master\' of /usr/local/google/game/mirror/googleplex-androi...
author
Dan Albert
<danalbert@google.com>
Thu, 5 Nov 2015 21:05:28 +0000
(21:05 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 5 Nov 2015 21:05:28 +0000
(21:05 +0000)
am:
6ae3fe184c
-s ours
* commit '
6ae3fe184c6f2e402bfc452589b8cce7fc3f46a5
':
Use std::unique_ptr instead of UniquePtr.
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Trivial merge