OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1e59b33 de89f44)
am de89f449: am ddcc2161: am c12a3e35: am 85bfcbd3: am 97c4ba98: docs: Added info...
authorRicardo Cervera <rcervera@google.com>
Fri, 16 Jan 2015 20:02:45 +0000 (20:02 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 16 Jan 2015 20:02:45 +0000 (20:02 +0000)
* commit 'de89f449a7159370b674f1c7cadf5558af0ef9e2':
  docs: Added info on noHistory and onActivityResult().


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