OSDN Git Service

(root) / android-x86 / frameworks-base.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 05759ef 4d329a8)
resolved conflicts for merge of 4d329a8f to klp-modular-dev-plus-aosp
authorRobert Ly <robertly@google.com>
Mon, 30 Jun 2014 00:55:24 +0000 (17:55 -0700)
committerRobert Ly <robertly@google.com>
Mon, 30 Jun 2014 00:55:24 +0000 (17:55 -0700)
commitbc2b05299d5fb369aa5c912ccad8e8e3ade06d90
treec7da007c1eadd5a0b63ecd9691e629bee070ac0ctree | snapshot
parent05759ef766b85a2987bcd8c92d246b186a6dddedcommit | diff
parent4d329a8f12253ed514ca422922e34d41fee29e77commit | diff
resolved conflicts for merge of 4d329a8f to klp-modular-dev-plus-aosp

Change-Id: Id8096712bc63fe16f93dca4a7963440e11087f7a
Android.mk diff1 | diff2 | blob | history
frameworks/base
About OSDN
Find Software
Develop Software
Help