OSDN Git Service

(root) / android-x86 / frameworks-base.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 737768c 925a659)
resolved conflicts for merge of 925a659d to jb-mr1-aah-dev
authorRobert Greenwalt <rgreenwalt@google.com>
Sat, 29 Sep 2012 00:00:00 +0000 (17:00 -0700)
committerRobert Greenwalt <rgreenwalt@google.com>
Sat, 29 Sep 2012 00:00:00 +0000 (17:00 -0700)
commita6c9a612af2e9edb877cf0e277a3bbeaa9a8a697
tree9d972aef412217f2c3e8e8f11195948e5617f688tree | snapshot
parent737768c1b562e0f22aa83160823f208757fe72bfcommit | diff
parent925a659d824089d2977b44a6740f793ae65f809acommit | diff
resolved conflicts for merge of 925a659d to jb-mr1-aah-dev

Change-Id: I520c5df139c88cc0fecaeffdc9e2b5eb8dd352aa
services/java/com/android/server/updatable/ConfigUpdateInstallReceiver.java diff1 | diff2 | blob | history
frameworks/base
About OSDN
Find Software
Develop Software
Help