summaryrefslogtreecommitdiff
path: root/opengl/java
diff options
context:
space:
mode:
author Todd Kennedy <toddke@google.com> 2015-09-24 21:56:34 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-09-24 21:56:34 +0000
commit0b29ba687eb59d215c993709ada61aeb31b5c108 (patch)
tree014f1749598002534ba42469dd4a3d69b9bad7ed /opengl/java
parent5954383b1fc223ce8f185b6a9d06799ed5299eb0 (diff)
parent8f08db9def9b40075534facd20add5835cd3b5be (diff)
am 8f08db9d: am 4e321745: resolved conflicts for cafacef6 to stage-aosp-master
* commit '8f08db9def9b40075534facd20add5835cd3b5be': Frameworks/base: Propagate boot status to installd
Diffstat (limited to 'opengl/java')
0 files changed, 0 insertions, 0 deletions