OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 00cfba9 8237dd8)
Merge commit '8237dd82' into manualmerge
authorSelim Gurun <sgurun@google.com>
Tue, 23 Apr 2013 18:08:37 +0000 (11:08 -0700)
committerSelim Gurun <sgurun@google.com>
Tue, 23 Apr 2013 18:19:12 +0000 (11:19 -0700)
Bug: 6923539

Skipping the change. We already fixed this in master and jb-mr2-dev
in sha: 2905e18b03c6ce34739bed9c06b865b29087deea. A compatible change
was submitted to jb-dev (and so automerged to jb-mr1-dev). see sha
7918cf4e6b18ab1aa4dce1cb791bb88ec1f383d6. The conflict occurs while
merging 8237dd82bf151cb102a69243f91832be1c1294e4 which I thought was
DO NOT MERGE anyway.

Change-Id: If96e368d2e2cec98bc18069151a2ff861b53608f


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