summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * | | | | | | | am aad8d90c: am b4881f79: am 451d8225: am 49187c94: am 53a56ad8: am ↵Amith Yamasani2013-09-274-4/+20
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 447415f4: am 78708503: am 77aa51e5: Make sure that external callers cannot pass in the confirm bypass extra * commit 'aad8d90ce082d01e6420227572891a2fce65306a': Make sure that external callers cannot pass in the confirm bypass extra
| | | | * \ \ \ \ \ \ \ am b4881f79: am 451d8225: am 49187c94: am 53a56ad8: am 447415f4: am ↵Amith Yamasani2013-09-274-4/+20
| | | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 78708503: am 77aa51e5: Make sure that external callers cannot pass in the confirm bypass extra * commit 'b4881f79e1c065b40f234710b6fb28acce9e164f': Make sure that external callers cannot pass in the confirm bypass extra
| | | | | * \ \ \ \ \ \ \ am 451d8225: am 49187c94: am 53a56ad8: am 447415f4: am 78708503: am ↵Amith Yamasani2013-09-274-4/+20
| | | | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 77aa51e5: Make sure that external callers cannot pass in the confirm bypass extra * commit '451d8225ef3ae407f52512a93bcf04e6400eb997': Make sure that external callers cannot pass in the confirm bypass extra
| | | | | | * \ \ \ \ \ \ \ am 49187c94: am 53a56ad8: am 447415f4: am 78708503: am 77aa51e5: Make sure ↵Amith Yamasani2013-09-274-4/+20
| | | | | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | that external callers cannot pass in the confirm bypass extra * commit '49187c9418dc2c5f404385596db3d82dd896c178': Make sure that external callers cannot pass in the confirm bypass extra
| | | | | | | * \ \ \ \ \ \ \ am 53a56ad8: am 447415f4: am 78708503: am 77aa51e5: Make sure that external ↵Amith Yamasani2013-09-274-4/+20
| | | | | | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | callers cannot pass in the confirm bypass extra * commit '53a56ad89cbd14410dcd8e5755c6765f1a438928': Make sure that external callers cannot pass in the confirm bypass extra
| | | | | | | | * \ \ \ \ \ \ \ am 447415f4: am 78708503: am 77aa51e5: Make sure that external callers ↵Amith Yamasani2013-09-274-4/+20
| | | | | | | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cannot pass in the confirm bypass extra * commit '447415f4f17dc91d3844394625f4e6fa10efedad': Make sure that external callers cannot pass in the confirm bypass extra
| | | | | | | | | * \ \ \ \ \ \ \ am 78708503: am 77aa51e5: Make sure that external callers cannot pass in the ↵Amith Yamasani2013-09-274-4/+20
| | | | | | | | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | confirm bypass extra * commit '7870850387dabd32a54e3fca7d65dea5f45a9a16': Make sure that external callers cannot pass in the confirm bypass extra
| | | | | | | | | | * \ \ \ \ \ \ \ am 77aa51e5: Make sure that external callers cannot pass in the confirm ↵Amith Yamasani2013-09-274-4/+20
| | | | | | | | | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bypass extra * commit '77aa51e5b7261638590af1d69ac03f4c8cd25692': Make sure that external callers cannot pass in the confirm bypass extra
| | | | | | | | | | | * | | | | | | | Make sure that external callers cannot pass in the confirm bypass extraAmith Yamasani2013-09-254-4/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Security fix for vulnerability where an app could launch into the screen lock change dialog without first confirming the existing password/pattern. Also, make sure that the fragments are launched with the correct corresponding activity. Bug: 9858403 Change-Id: I0f2c00a44abeb624c6fba0497bf6036a6f1a4564
* | | | | | | | | | | | | | | | | | | am 93e6a023: Merge "Set divider color for light theme" into klp-devRussell Brenner2013-09-303-2/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '93e6a023c5d6ce0f7f79e40c1385c06b0c0135ea': Set divider color for light theme
| * | | | | | | | | | | | | | | | | | Merge "Set divider color for light theme" into klp-devRussell Brenner2013-09-273-2/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Set divider color for light themeRussell Brenner2013-09-263-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10928581 Change-Id: I5586cae0ef2c49f5297f94bb7fb6ddede9d64b76
* | | | | | | | | | | | | | | | | | | am 86f74d2a: Merge "Tap & pay: change empty state UX and strings." into klp-devMartijn Coenen2013-09-304-5/+45
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '86f74d2ad407214e23a717f2f24046ce9a89ea48': Tap & pay: change empty state UX and strings.
| * | | | | | | | | | | | | | | | | | Merge "Tap & pay: change empty state UX and strings." into klp-devMartijn Coenen2013-09-274-5/+45
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Tap & pay: change empty state UX and strings.Martijn Coenen2013-09-274-5/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10965661 Change-Id: Iee0b8bf111ef2105babb0912942f5c764b75ac59
* | | | | | | | | | | | | | | | | | | am 8181c816: Merge "Add icons to the printer list items in settings." into ↵Svetoslav2013-09-302-4/+85
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-dev * commit '8181c8166f2dcd74fab0c422edf02e0ff7148fe5': Add icons to the printer list items in settings.
| * | | | | | | | | | | | | | | | | | Merge "Add icons to the printer list items in settings." into klp-devSvetoslav2013-09-272-4/+85
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Add icons to the printer list items in settings.Svetoslav2013-09-262-4/+85
| | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:10955751 Change-Id: Iea87a9a07624d6e26274030a51f912f8d2ef0e10
* | | | | | | | | | | | | | | | | | am 4ba66781: Merge "Hacked to display Puzzle icon for GCore" into klp-devLifu Tang2013-09-301-1/+53
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4ba66781f30c7d96274bbf4b6395838495fea399': Hacked to display Puzzle icon for GCore
| * | | | | | | | | | | | | | | | | Merge "Hacked to display Puzzle icon for GCore" into klp-devLifu Tang2013-09-271-1/+53
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Hacked to display Puzzle icon for GCoreLifu Tang2013-09-261-1/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fix b/10856957 Change-Id: I0716c9f5c6d818cd38dfc30a6b0b29deaa994367
* | | | | | | | | | | | | | | | | | am 2f78d82a: Merge "Don\'t show help menu when browser unavailable" into klp-devLifu Tang2013-09-301-3/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2f78d82ab3a2858b3265cf01099db455fb43f4b1': Don't show help menu when browser unavailable
| * | | | | | | | | | | | | | | | | Merge "Don't show help menu when browser unavailable" into klp-devLifu Tang2013-09-271-3/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Don't show help menu when browser unavailableLifu Tang2013-09-251-3/+10
| | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fix b/10860551 Change-Id: I71d073ef96d406f1705672d7ccf75337e5250ec6
* | | | | | | | | | | | | | | | | am 2a2fcdd6: am bc2c3db8: Add print job settings screen.Svetoslav Ganov2013-09-2613-74/+793
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2a2fcdd6dbeee06af8acca7c76fbe905c862cbd4': Add print job settings screen.
| * | | | | | | | | | | | | | | | am bc2c3db8: Add print job settings screen.Svetoslav Ganov2013-09-2613-74/+793
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'bc2c3db8f923b9ee25345f5ebbad9f6c762a1e23': Add print job settings screen.
| | * | | | | | | | | | | | | | | Add print job settings screen.Svetoslav Ganov2013-09-2613-74/+793
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a list of active print jobs to the main print settings screen. Selecting a print job from there leads to a print job settings screen with more information about the print job and actions to change the prit job state such as cancel and restart. bug:10935736 Change-Id: Idd6826a998309941c3d8478dafe4b039c8ca4f45
* | | | | | | | | | | | | | | | | am 01aa7930: am 077f83a2: Merge "Latest UX for Tap & pay." into klp-devMartijn Coenen2013-09-2611-43/+117
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '01aa7930306e15ba4ce942844506e42df85a0a04': Latest UX for Tap & pay.
| * | | | | | | | | | | | | | | | am 077f83a2: Merge "Latest UX for Tap & pay." into klp-devMartijn Coenen2013-09-2611-43/+117
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '077f83a22c3d9b8650b2ba4dab4f17e55fde59fb': Latest UX for Tap & pay.
| | * | | | | | | | | | | | | | | Merge "Latest UX for Tap & pay." into klp-devMartijn Coenen2013-09-2611-43/+117
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Latest UX for Tap & pay.Martijn Coenen2013-09-2511-43/+117
| | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10862185 Change-Id: I4344f70533a69d422159547c58bbc981f4d889ca
* | | | | | | | | | | | | | | | am ff91e56f: am 873c3723: Merge "Updated de-blued backgrounds for settings ↵Mindy Pereira2013-09-264-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | power widget." into klp-dev * commit 'ff91e56f8b17f4f986dd5512c3e7444875f2427f': Updated de-blued backgrounds for settings power widget.
| * | | | | | | | | | | | | | | am 873c3723: Merge "Updated de-blued backgrounds for settings power widget." ↵Mindy Pereira2013-09-264-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into klp-dev * commit '873c3723233f3fffd2ccd58041579bcd454d1e55': Updated de-blued backgrounds for settings power widget.
| | * | | | | | | | | | | | | | Merge "Updated de-blued backgrounds for settings power widget." into klp-devMindy Pereira2013-09-264-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | Updated de-blued backgrounds for settings power widget.Mindy Pereira2013-09-254-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I940999244d7bb6c2ec800c16b3c55c266d9b70c9
* | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2013-09-2657-135/+369
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-09-2557-135/+369
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8dc4ee767b10e74fa862573130e163c3a451c152 Auto-generated-cl: translation import
* | | | | | | | | | | | | | | | | am d5e430b5: am cb407569: Merge "Make sure that external callers cannot pass ↵Amith Yamasani2013-09-254-4/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| / / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in the confirm bypass extra" into klp-dev * commit 'd5e430b59a991e5d8e54b20be896c07434d56954': Make sure that external callers cannot pass in the confirm bypass extra
| * | | | | | | | | | | | | | | am cb407569: Merge "Make sure that external callers cannot pass in the ↵Amith Yamasani2013-09-254-4/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | confirm bypass extra" into klp-dev * commit 'cb407569b35d0605ffedfd6c00ee9a88c8da3aa4': Make sure that external callers cannot pass in the confirm bypass extra
| | * | | | | | | | | | | | | | Merge "Make sure that external callers cannot pass in the confirm bypass ↵Amith Yamasani2013-09-254-4/+20
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | extra" into klp-dev
| | | * | | | | | | | | | | | | Make sure that external callers cannot pass in the confirm bypass extraAmith Yamasani2013-09-254-4/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Security fix for vulnerability where an app could launch into the screen lock change dialog without first confirming the existing password/pattern. Also, make sure that the fragments are launched with the correct corresponding activity. Bug: 9858403 Change-Id: I0f2c00a44abeb624c6fba0497bf6036a6f1a4564
* | | | | | | | | | | | | | | | am 90a51e2b: am e57248e5: Merge "Replace blue pressed feedback with gray." ↵Rob Tsuk2013-09-259-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into klp-dev * commit '90a51e2bf9c61a80ebc79f6c9ad5e7b774860bfc': Replace blue pressed feedback with gray.
| * | | | | | | | | | | | | | | am e57248e5: Merge "Replace blue pressed feedback with gray." into klp-devRob Tsuk2013-09-259-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e57248e5f63172a5c78184ff9c885c823cb1dae8': Replace blue pressed feedback with gray.
| | * | | | | | | | | | | | | | Merge "Replace blue pressed feedback with gray." into klp-devRob Tsuk2013-09-259-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | Replace blue pressed feedback with gray.Rob Tsuk2013-09-259-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I03d5fbcd05975792dc27160d8ea44abdc1894624
* | | | | | | | | | | | | | | | | am c2314e32: (-s ours) am 083e6cc0: (-s ours) Merge "Import translations. DO ↵Baligh Uddin2013-09-250-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into klp-dev * commit 'c2314e3229861a483b67b03dda2f9425b3b5cc68': Import translations. DO NOT MERGE
| * | | | | | | | | | | | | | | | am 083e6cc0: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-09-250-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '083e6cc01276ab4feb9bb060d4f830cddbccff69': Import translations. DO NOT MERGE
| | * | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-09-2557-135/+369
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-09-2557-135/+369
| | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id3d24fbbdc9140e85e5b5831a03b474641d3e871 Auto-generated-cl: translation import
* | | | | | | | | | | | | | | | am 594ffa25: am 372b6f74: Enable runtime selection for art for user buildsBrian Carlstrom2013-09-251-3/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '594ffa25b068d79eaad43a1eb1636d79d508151a': Enable runtime selection for art for user builds