tree 6ceb3b5acea7b78682a947085352a2d35a72df55
parent 9e9c18d55b34c97db2c39a9fa0a2190b423b4c0b
parent 6d4f39754bff9c1dcb8023839ea583b6d0723b14
author Jean-Michel Trivi <jmtrivi@google.com> 1311697650 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1311697650 -0700

Merge "Fix bug 4319552 Use commonly defined channel mask values in native"