tree c9ee66ecfe629d81eb62e62f84435fa04cc88b6c
parent 94ad175d3839d00f72305a2a0390b1a1adc1b2a2
parent 2b58ea3fb35d4aef5615c8249ff100789b59d8e3
author Yorke Lee <yorkelee@google.com> 1378244258 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1378244259 +0000

Merge "Enable reject via text" into klp-dev