OSDN Git Service

Merge commit 'e866294e' into lmp-mr1-dev-plus-aosp
authorQiwen Zhao <zhao@google.com>
Thu, 18 Sep 2014 19:21:48 +0000 (12:21 -0700)
committerQiwen Zhao <zhao@google.com>
Thu, 18 Sep 2014 19:21:48 +0000 (12:21 -0700)
commitd542afcb931850a87c2d151859bd184047be0b8d
treec0100ddde1850d13fd3ac5fd9f747f316789cb2a
parentd76f466f89d14000001f94076ab35e76fd82af16
parente866294eec6b54cfda57d29946e129b7a7bd00e0
Merge commit 'e866294e' into lmp-mr1-dev-plus-aosp

Conflicts:
tools/droiddoc/templates-sac/assets/images/sac_logo.png