summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Reland: Improvements to TextView Ctrl-Z undo supportJames Cook2015-02-271-105/+215
| | | | | | | | | | | | | | | | | | This relands commit 7713d18847c7fe81fb5f34e888aaf8167862f5fd which was reverted in commit 3ac0bcb095e0067721a5e35d3b4c51e4090842a3. Original description: * Undo/redo restores cursor position * Multiple deletes are consolidated into a single operation * Don't create undo history for invalid or no-op operations * Move logic for merging operations into Editor.EditOperation CTS tests in android.widget.cts.TextViewTest will land separately. Bug: 19332904 Bug: 19450037 Bug: 19505388 Change-Id: Ice27e3c4e5e421b47be8c4e9964c10844e61b0fc
* Merge "Reland: Add basic support for Ctrl-Z to editable TextViews"James Cook2015-02-278-35/+144
|\
| * Reland: Add basic support for Ctrl-Z to editable TextViewsJames Cook2015-02-278-35/+144
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reland 9201e797833f35b9afb219f88c10d3b6fda02a4e which was reverted in c8f08e07a47cc259a25caed3f731ee7044328635. Original description: * Add an UndoManager to the Editor for each editable TextView * Record operations as being owned by that Editor * Parcel the undo state * Wire hardware keyboard shortcuts Ctrl-Z for undo and Ctrl-Shift-Z for redo into TextView shortcut handling. * Expose IDs for "undo" and "redo" for symmetry with cut/copy/paste. Additional fix: * Ensure each UndoOwner always has a valid mManager, even after the UndoManager is parceled and restored. Bug: 19332904 Bug: 19505388 Change-Id: Iad4476e6e9ca952281e69bf22c07cca915dfa7bd
* | am bbef7cf3: am 012c3b72: am a891d08d: Merge "jni: Add paranoia regarding ↵Mark Salyzyn2015-02-271-0/+4
|\ \ | | | | | | | | | | | | | | | | | | android_logger_list_read" * commit 'bbef7cf3bbf778dd8ae3b91b140bf4542241093b': jni: Add paranoia regarding android_logger_list_read
| * \ am 012c3b72: am a891d08d: Merge "jni: Add paranoia regarding ↵Mark Salyzyn2015-02-271-0/+4
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | android_logger_list_read" * commit '012c3b723a8e73012444b7f839b363f698725a01': jni: Add paranoia regarding android_logger_list_read
| | * \ am a891d08d: Merge "jni: Add paranoia regarding android_logger_list_read"Mark Salyzyn2015-02-271-0/+4
| | |\ \ | | | | | | | | | | | | | | | | | | | | * commit 'a891d08dad829c9aacd29bd2c3b36debe3fc1cc3': jni: Add paranoia regarding android_logger_list_read
| | | * \ Merge "jni: Add paranoia regarding android_logger_list_read"Mark Salyzyn2015-02-271-0/+4
| | | |\ \
| | | | * | jni: Add paranoia regarding android_logger_list_readMark Salyzyn2015-02-261-0/+4
| | | |/ / | | | | | | | | | | | | | | | Change-Id: Ic52be201ec7efaef6a385aaf8ea523554aa06f22
* | | | | Merge "Glop TextureLayer support"Chris Craik2015-02-276-25/+79
|\ \ \ \ \
| * | | | | Glop TextureLayer supportChris Craik2015-02-276-25/+79
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I348a926bd4a2f47be9fdbe74058c0aa2f8dc6276
* | | | | | Merge "Move ALSA utilities to com.android.internal.alsa package"Mike Lockwood2015-02-274-5/+5
|\ \ \ \ \ \
| * | | | | | Move ALSA utilities to com.android.internal.alsa packageMike Lockwood2015-02-264-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icbd45ec97a942e44e60f8d4ba0bb58c97f85b55f
* | | | | | | Merge "Implement landscape layout for time picker dialog"Alan Viverette2015-02-2734-660/+585
|\ \ \ \ \ \ \
| * | | | | | | Implement landscape layout for time picker dialogAlan Viverette2015-02-2634-660/+585
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds support overriding default alert dialog panel elements by including them in the dialog's custom content view, but no public API (yet!) since the panel IDs have never been public. Some minor cleanup and refactoring in TimePickerDialog. Removes Holo styles for "clock" and "calendar" style pickers since they are new in Material. If the new styles are used against Holo they will match Material but with Holo primary/accent colors. Also implements themed color state lists to resolve TODOs in both time and date pickers. Bug: 19431361 Change-Id: I095fd8d653e02d9e5d20d66611432a08a7a5685e
* | | | | | | | Merge "don't reference (deprecated) kIgnore_SkAlphaType"Mike Reed2015-02-272-3/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | don't reference (deprecated) kIgnore_SkAlphaTypeMike Reed2015-02-272-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6c09845c48efc66a1057bc8db512b7567ade7e72
* | | | | | | | | am d85224b6: am 25395a7e: am 4490d6b5: am dedba01a: am d57871e0: am ↵Luan Nguyen2015-02-271-0/+9
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8aa8960e: am a464d409: Merge "docs: Add steps to enable adb debugging on Wear device" into lmp-docs * commit 'd85224b6bd9b14e50163fc05b9ad90ccb9e79ee1': docs: Add steps to enable adb debugging on Wear device
| * | | | | | | | am 25395a7e: am 4490d6b5: am dedba01a: am d57871e0: am 8aa8960e: am ↵Luan Nguyen2015-02-271-0/+9
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a464d409: Merge "docs: Add steps to enable adb debugging on Wear device" into lmp-docs * commit '25395a7e07caca454bb411492698ea8ce1aaaaa9': docs: Add steps to enable adb debugging on Wear device
| | * \ \ \ \ \ \ \ am 4490d6b5: am dedba01a: am d57871e0: am 8aa8960e: am a464d409: Merge ↵Luan Nguyen2015-02-271-0/+9
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "docs: Add steps to enable adb debugging on Wear device" into lmp-docs * commit '4490d6b5706bd839896b3760954a08cb4dc0575d': docs: Add steps to enable adb debugging on Wear device
| | | * \ \ \ \ \ \ \ am dedba01a: am d57871e0: am 8aa8960e: am a464d409: Merge "docs: Add steps ↵Luan Nguyen2015-02-271-0/+9
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to enable adb debugging on Wear device" into lmp-docs * commit 'dedba01ac8b85d535171a910aa6b72ea9ce4498c': docs: Add steps to enable adb debugging on Wear device
| | | | * \ \ \ \ \ \ \ am d57871e0: am 8aa8960e: am a464d409: Merge "docs: Add steps to enable adb ↵Luan Nguyen2015-02-271-0/+9
| | | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | debugging on Wear device" into lmp-docs * commit 'd57871e00d77bc852948de30a01b6856a6cfeb9b': docs: Add steps to enable adb debugging on Wear device
| | | | | * \ \ \ \ \ \ \ am 8aa8960e: am a464d409: Merge "docs: Add steps to enable adb debugging on ↵Luan Nguyen2015-02-271-0/+9
| | | | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wear device" into lmp-docs * commit '8aa8960edb10089570acd5d3b19cfd9be7253fab': docs: Add steps to enable adb debugging on Wear device
| | | | | | * \ \ \ \ \ \ \ am a464d409: Merge "docs: Add steps to enable adb debugging on Wear device" ↵Luan Nguyen2015-02-271-0/+9
| | | | | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-docs * commit 'a464d409f68ca9a59ac4261edd46866ae2af68bf': docs: Add steps to enable adb debugging on Wear device
| | | | | | | * \ \ \ \ \ \ \ Merge "docs: Add steps to enable adb debugging on Wear device" into lmp-docsLuan Nguyen2015-02-271-0/+9
| | | | | | | |\ \ \ \ \ \ \ \
| | | | | | | | * | | | | | | | docs: Add steps to enable adb debugging on Wear deviceLuan Nguyen2015-02-251-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 19425073 Change-Id: Iead63dfe12c5187c5ed8e452fe7e934402ebd056
* | | | | | | | | | | | | | | | am c9c0de9e: am 6876209a: am a667bcd6: am d4cdf18e: am b8593133: am ↵Ryosuke Matsuuchi2015-02-274-2/+195
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c1120b45: am 8f0e9c75: Merge "doc: Add Japanese version of DAC/distribute/ page." into lmp-docs * commit 'c9c0de9e79f2cc381249e6a1551e136f6bb0854c': doc: Add Japanese version of DAC/distribute/ page.
| * | | | | | | | | | | | | | | am 6876209a: am a667bcd6: am d4cdf18e: am b8593133: am c1120b45: am ↵Ryosuke Matsuuchi2015-02-274-2/+195
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8f0e9c75: Merge "doc: Add Japanese version of DAC/distribute/ page." into lmp-docs * commit '6876209ae84ee55d4803f8c32032a89735e76c1f': doc: Add Japanese version of DAC/distribute/ page.
| | * | | | | | | | | | | | | | am a667bcd6: am d4cdf18e: am b8593133: am c1120b45: am 8f0e9c75: Merge "doc: ↵Ryosuke Matsuuchi2015-02-274-2/+195
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Japanese version of DAC/distribute/ page." into lmp-docs * commit 'a667bcd688a35f7c9184452ffe7eb4bfe2989bf2': doc: Add Japanese version of DAC/distribute/ page.
| | | * | | | | | | | | | | | | am d4cdf18e: am b8593133: am c1120b45: am 8f0e9c75: Merge "doc: Add Japanese ↵Ryosuke Matsuuchi2015-02-274-2/+195
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | version of DAC/distribute/ page." into lmp-docs * commit 'd4cdf18e1c763c2aaedbb4f0cab3657db2adc097': doc: Add Japanese version of DAC/distribute/ page.
| | | | * | | | | | | | | | | | am b8593133: am c1120b45: am 8f0e9c75: Merge "doc: Add Japanese version of ↵Ryosuke Matsuuchi2015-02-274-2/+195
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DAC/distribute/ page." into lmp-docs * commit 'b859313312a85285c2c243a5e58d133e308ee590': doc: Add Japanese version of DAC/distribute/ page.
| | | | | * | | | | | | | | | | am c1120b45: am 8f0e9c75: Merge "doc: Add Japanese version of ↵Ryosuke Matsuuchi2015-02-274-2/+195
| | | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DAC/distribute/ page." into lmp-docs * commit 'c1120b459eb1ecabd54966cef1873f0f0707382d': doc: Add Japanese version of DAC/distribute/ page.
| | | | | | * | | | | | | | | | am 8f0e9c75: Merge "doc: Add Japanese version of DAC/distribute/ page." into ↵Ryosuke Matsuuchi2015-02-274-2/+195
| | | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-docs * commit '8f0e9c7593fee981fc4b3831aae76a1f20e236db': doc: Add Japanese version of DAC/distribute/ page.
| | | | | | | * | | | | | | | | Merge "doc: Add Japanese version of DAC/distribute/ page." into lmp-docsRyosuke Matsuuchi2015-02-274-2/+195
| | | | | | | |\ \ \ \ \ \ \ \ \
| | | | | | | | * | | | | | | | | doc: Add Japanese version of DAC/distribute/ page.Ryosuke Matsuuchi2015-02-184-1/+194
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18847144 Change-Id: I7bd98c381d8d58367862daedb7aaedfb0112b9d1
* | | | | | | | | | | | | | | | | am be76cc2f: am 35b15f39: am f8ceaa6b: am 3a5b0815: am 3daee377: am ↵Andrew Solovay2015-02-275-48/+222
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | | | | | | | | | | / / / / / / / | |_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7f26f2b9: am b5e00e5c: docs: Documented new IABv5 sub upgrade/downgrade and manual renewal * commit 'be76cc2f682550a17992467a69513dc4b5838c6d': docs: Documented new IABv5 sub upgrade/downgrade and manual renewal
| * | | | | | | | | | | | | | | am 35b15f39: am f8ceaa6b: am 3a5b0815: am 3daee377: am 7f26f2b9: am ↵Andrew Solovay2015-02-275-48/+222
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b5e00e5c: docs: Documented new IABv5 sub upgrade/downgrade and manual renewal * commit '35b15f399b9c0140544384115215e08f16659cbb': docs: Documented new IABv5 sub upgrade/downgrade and manual renewal
| | * | | | | | | | | | | | | | am f8ceaa6b: am 3a5b0815: am 3daee377: am 7f26f2b9: am b5e00e5c: docs: ↵Andrew Solovay2015-02-275-48/+222
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documented new IABv5 sub upgrade/downgrade and manual renewal * commit 'f8ceaa6b557f59fdd654ce63e35f9b73c0be33b8': docs: Documented new IABv5 sub upgrade/downgrade and manual renewal
| | | * | | | | | | | | | | | | am 3a5b0815: am 3daee377: am 7f26f2b9: am b5e00e5c: docs: Documented new ↵Andrew Solovay2015-02-275-48/+222
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IABv5 sub upgrade/downgrade and manual renewal * commit '3a5b08153e432b79e40bc5ddd62db2bb5fcf71e9': docs: Documented new IABv5 sub upgrade/downgrade and manual renewal
| | | | * | | | | | | | | | | | am 3daee377: am 7f26f2b9: am b5e00e5c: docs: Documented new IABv5 sub ↵Andrew Solovay2015-02-275-48/+222
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | upgrade/downgrade and manual renewal * commit '3daee37705d23a0f91680aa954e4bcdb2dfdf4e8': docs: Documented new IABv5 sub upgrade/downgrade and manual renewal
| | | | | * | | | | | | | | | | am 7f26f2b9: am b5e00e5c: docs: Documented new IABv5 sub upgrade/downgrade ↵Andrew Solovay2015-02-275-48/+222
| | | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and manual renewal * commit '7f26f2b96a23f32bca69862b254dbbe8b59049d9': docs: Documented new IABv5 sub upgrade/downgrade and manual renewal
| | | | | | * | | | | | | | | | am b5e00e5c: docs: Documented new IABv5 sub upgrade/downgrade and manual renewalAndrew Solovay2015-02-275-48/+222
| | | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b5e00e5c3db7fc7121aeff6dc7d20b21740d47e5': docs: Documented new IABv5 sub upgrade/downgrade and manual renewal
| | | | | | | * | | | | | | | | docs: Documented new IABv5 sub upgrade/downgrade and manual renewalAndrew Solovay2015-02-265-48/+222
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documented new support for users upgrading/downgrading subscriptions in the middle of a sub period, and for users manually renewing before the subscription period ends. Also updated testing docs to reflect that sandbox now supports testing subscriptions, and documented new "autoRenewing" field in INAPP_PURCHASE_DATA. See first comment for doc stage location. bug: 18982828 bug: 18916814 bug: 18951608 bug: 18908756 Change-Id: I530b57d840ed5aeefe4c6a688a2e59aec41ec7d0
* | | | | | | | | | | | | | | | Merge "expose ST_* in OsConstants"Nick Kralevich2015-02-272-0/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | expose ST_* in OsConstantsNick Kralevich2015-02-262-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7982843502cf8a17188b2422af44e8d41450a586
* | | | | | | | | | | | | | | | | MenuItem, navigation and overflow icon tintingChris Banes2015-02-2711-7/+491
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - iconTint and iconTintMode attrs for MenuItem, with associated setters. - navigationTint and navigationTintMode attrs for Toolbar with associated setters. - overlflowTint and overflowTintMode attrs for Toolbar with associated setters. BUG: 18126050 BUG: 19148351 BUG: 19305408 Change-Id: Ibd1fae7cdbc7a7c42809e52541fae5d8beb18e92
* | | | | | | | | | | | | | | | | am 4d9031bd: (-s ours) am 50b04190: (-s ours) Merge "Import translations. DO ↵Geoff Mendal2015-02-270-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into stage-aosp-master * commit '4d9031bda69fbf7b48241539788db8560b3953b2': Import translations. DO NOT MERGE
| * | | | | | | | | | | | | | | | am 50b04190: (-s ours) Merge "Import translations. DO NOT MERGE" into ↵Geoff Mendal2015-02-270-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stage-aosp-master * commit '50b04190c93a0225721ff1d9b7572be69be73423': Import translations. DO NOT MERGE
| | * | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into stage-aosp-masterGeoff Mendal2015-02-2772-218/+146
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-02-2672-218/+146
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id83bfa16ba15aaa1f901547117c114490f4035fa Auto-generated-cl: translation import
* | | | | | | | | | | | | | | | | | am 7c51c056: (-s ours) am 10b62bff: (-s ours) Merge "Import translations. DO ↵Geoff Mendal2015-02-270-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into stage-aosp-master * commit '7c51c056b31cdd7a9fc6678823c5932d6f9fec4a': Import translations. DO NOT MERGE
generated by cgit v1.1 at 2025-08-05 02:12:08 +0000