tree bee4c5f2e9aea7239fb89cb241db66b872b4608d
parent f9df59a7ff292b536a557280cb8b2fc93eedabd0
parent 4fd217a1c6d149a826b7d6d09661d32cfecb6454
author Ching Tzung Lin <ctlin@google.com> 1437692223 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1437692223 +0000

Merge "Fix compilation error on emerald-dev" into cw-e-dev