tree 3bbbbb9ba44c46cb3cf31c70ad3cce6184956ab9
parent a8c247e0b4e14123f85cec00500144ff28aaf6ed
parent 47051d8e6dfcede55fa926c38bc06a6314fe6e4f
author Etan Cohen <etancohen@google.com> 1436382151 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1436382154 +0000

Merge "Lock screen text: consider possible WFC service in APM" into mnc-dev