OSDN Git Service

Merge "Fix compilation error on emerald-dev" into cw-e-dev
authorChing Tzung Lin <ctlin@google.com>
Thu, 23 Jul 2015 22:57:03 +0000 (22:57 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 23 Jul 2015 22:57:03 +0000 (22:57 +0000)
commitd4884e2f3c138a7cc881bb1fb34b672a1c9db595
treebee4c5f2e9aea7239fb89cb241db66b872b4608d
parentf9df59a7ff292b536a557280cb8b2fc93eedabd0
parent4fd217a1c6d149a826b7d6d09661d32cfecb6454
Merge "Fix compilation error on emerald-dev" into cw-e-dev