diff options
| author | Yohei Yukawa <yukawa@google.com> | 2014-11-01 02:19:02 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-11-01 02:19:02 +0000 |
| commit | f5051e9b6771de3558d2b8adf7ef233721dad1d6 (patch) | |
| tree | b23d80141f6415164db43b1afe36d50f5926dc2d /core/java/android | |
| parent | 28d51a39a1bed35855b0fe75a65ad4a6d43a4460 (diff) | |
| parent | b1f56430d38f9d6bab0a3512905daaf994ba134b (diff) | |
| download | frameworks_base-f5051e9b6771de3558d2b8adf7ef233721dad1d6.zip frameworks_base-f5051e9b6771de3558d2b8adf7ef233721dad1d6.tar.gz frameworks_base-f5051e9b6771de3558d2b8adf7ef233721dad1d6.tar.bz2 | |
am 22cbf54c: Merge "Conditionally allow non-primay profiles to use TextServices" into lmp-mr1-dev
automerge: b1f5643
* commit 'b1f56430d38f9d6bab0a3512905daaf994ba134b':
Conditionally allow non-primay profiles to use TextServices
Diffstat (limited to 'core/java/android')
0 files changed, 0 insertions, 0 deletions