tree c65bfc8e7ababc8cd72462d5af7544da6d091e3c
parent 3d218582b2edf2d7cdd0dca038814753efa415ff
parent d00f7c4b4cbd09aa9fdcd484f0eb764417134657
author Andrew Hsieh <andrewhsieh@google.com> 1338529289 -0700
committer android code review <noreply-gerritcodereview@google.com> 1338529289 -0700

Merge "fix BUILD_DEBUG_EMULATOR build"