| commit | e504335f7fd561d95a4ea24390ac986e1b2429ed | [log] [tgz] |
|---|---|---|
| author | Yohei Yukawa <yukawa@google.com> | Sat Nov 01 03:24:18 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Nov 01 03:24:18 2014 +0000 |
| tree | be6a74982647e6084e51140396f392c8b8864a7d | |
| parent | e73c6d93b9a207713ef2cf5f6b927f5e54271295 [diff] | |
| parent | f5051e9b6771de3558d2b8adf7ef233721dad1d6 [diff] |
am f5051e9b: am 22cbf54c: Merge "Conditionally allow non-primay profiles to use TextServices" into lmp-mr1-dev automerge: b1f5643 * commit 'f5051e9b6771de3558d2b8adf7ef233721dad1d6': Conditionally allow non-primay profiles to use TextServices