drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
173,927 Commits 1 Branch 0 Tags
Commit Graph

173927 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yang Ni
712e38eaba Merge "Pass in code cache directory when creating a script group." automerge: 9559ce7 
automerge: 29fe5ef

* commit '29fe5ef179a4a7de15360650353c6196f9350b07':
  Pass in code cache directory when creating a script group.
 2015-02-03 06:27:39 +00:00
Yang Ni
29fe5ef179 Merge "Pass in code cache directory when creating a script group." 
automerge: 9559ce7

* commit '9559ce7c1bd4451a470d6e1542659e726b0dce3d':
  Pass in code cache directory when creating a script group.
 2015-02-03 06:22:55 +00:00
Yang Ni
9559ce7c1b Merge "Pass in code cache directory when creating a script group." 2015-02-03 06:20:20 +00:00
Joe Fernandez
e9557d7d27 am 175ddbcf: am d14b6432: am eba583e3: docs: February 2015 Dashboard updates automerge: c6ca860 
automerge: d99924d

* commit 'd99924d556b95bc05bbff9408519e301983193fb':
  docs: February 2015 Dashboard updates
 2015-02-02 20:29:31 +00:00
Joe Fernandez
d99924d556 am 175ddbcf: am d14b6432: am eba583e3: docs: February 2015 Dashboard updates automerge: c6ca860 
* commit '175ddbcf2ed71fdcd44a9b64cdc5d479df496a4d':
  docs: February 2015 Dashboard updates
 2015-02-02 19:35:00 +00:00
Jorim Jaggi
83eaf6cc8c am 515148dc: Merge "Send accessibility event when bouncer is shown" into lmp-mr1-dev 
automerge: 2ffb340

* commit '2ffb3400f7922aba597b61cea91b82bcfc3d7e7d':
  Send accessibility event when bouncer is shown
 2015-02-02 19:30:34 +00:00
Jorim Jaggi
2ffb3400f7 am 515148dc: Merge "Send accessibility event when bouncer is shown" into lmp-mr1-dev 
* commit '515148dcaaf5b63e69998d67958829d4347071ec':
  Send accessibility event when bouncer is shown
 2015-02-02 19:25:34 +00:00
Joe Fernandez
175ddbcf2e am d14b6432: am eba583e3: docs: February 2015 Dashboard updates 
automerge: c6ca860

* commit 'c6ca8600a4257b25d2ffd1ab6abe02089d06b3d7':
  docs: February 2015 Dashboard updates
 2015-02-02 19:24:38 +00:00
Jorim Jaggi
515148dcaa Merge "Send accessibility event when bouncer is shown" into lmp-mr1-dev 2015-02-02 19:19:24 +00:00
Jorim Jaggi
c1dff8cee8 Send accessibility event when bouncer is shown 
Bug: 18996476
Change-Id: I0e402aa198263807e3013c7fb151f28d049ea51a
 2015-02-02 20:18:26 +01:00
Joe Fernandez
c6ca8600a4 am d14b6432: am eba583e3: docs: February 2015 Dashboard updates 
* commit 'd14b64323ff92be9db804d66a1146693c27150a6':
  docs: February 2015 Dashboard updates
 2015-02-02 17:44:26 +00:00
Robert Greenwalt
21475c6a92 am 0cdd4560: am fabf0e0b: Merge "Fixing up the formatting code which is already merged" 
* commit '0cdd4560dac5784dda169863eb844d489bdc79d5':
 2015-02-02 17:29:21 +00:00
Joe Fernandez
d14b64323f am eba583e3: docs: February 2015 Dashboard updates 
* commit 'eba583e3930891f7a8a0e48a961a4a2471fc757c':
  docs: February 2015 Dashboard updates
 2015-02-02 17:20:35 +00:00
Robert Greenwalt
0cdd4560da am fabf0e0b: Merge "Fixing up the formatting code which is already merged" 
* commit 'fabf0e0ba84e0cd28f459360b20386e68179cc31':
 2015-02-02 17:16:32 +00:00
Robert Greenwalt
fabf0e0ba8 Merge "Fixing up the formatting code which is already merged" 2015-02-02 17:00:43 +00:00
Joe Fernandez
eba583e393 docs: February 2015 Dashboard updates 
Change-Id: I1936395193ec4c382b2492f992149fa7a29c9282
 2015-02-02 08:48:42 -08:00
Tyler Gunn
736cb492ae am 235f60bc: am 4143b796: Merge "Fixing conference merge where only one party is added to conference." into lmp-mr1-dev 
* commit '235f60bc134646d1ce18ab872b982ff63b14845e':
  Fixing conference merge where only one party is added to conference.
 2015-02-02 16:00:12 +00:00
Tyler Gunn
235f60bc13 am 4143b796: Merge "Fixing conference merge where only one party is added to conference." into lmp-mr1-dev 
* commit '4143b796bc20072a12fe31cbfdf4f1918dff0728':
  Fixing conference merge where only one party is added to conference.
 2015-02-02 15:53:00 +00:00
Tyler Gunn
4143b796bc Merge "Fixing conference merge where only one party is added to conference." into lmp-mr1-dev 2015-02-02 15:48:53 +00:00
Geoff Mendal
aea95a6a59 am c6fc5287: (-s ours) Import translations. DO NOT MERGE 
* commit 'c6fc5287138744a4684a837c883dedde14359612':
  Import translations. DO NOT MERGE
 2015-02-02 15:30:25 +00:00
Geoff Mendal
c6fc528713 Import translations. DO NOT MERGE 
Change-Id: I1151a10a47c8545c3db3445a2cdbe6edffa6c177
Auto-generated-cl: translation import
 2015-02-02 08:39:50 -06:00
Robert Greenwalt
3c6e38d3b5 Fixing up the formatting code which is already merged 
I just apply google coding guide like space.

Uploading the same code about + handling just apply the Google Coding Guide.
The previous code is "https://android-review.googlesource.com/#/c/122770/"

This code is about + plus number converting logic for international NANP.

Change-Id: I23e4709294c603b387b28b3c2a56c932d838c666
 2015-02-02 15:04:56 +09:00
Jon Larimer
f96d6bc684 am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation automerge: 5c9d0de automerge: 9e7e8af automerge: 27d099a automerge: 4a82635 automerge: dcce25a 
automerge: 4f78e0b

* commit '4f78e0b1e849193f5e70447171b4f30ad0aee700':
 2015-01-31 05:44:27 +00:00
Jon Larimer
4f78e0b1e8 am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation automerge: 5c9d0de automerge: 9e7e8af automerge: 27d099a automerge: 4a82635 
automerge: dcce25a

* commit 'dcce25a9a7fb3458f2fb65b23912b5f7eb42c596':
 2015-01-31 05:27:30 +00:00
Jon Larimer
dcce25a9a7 am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation automerge: 5c9d0de automerge: 9e7e8af automerge: 27d099a 
automerge: 4a82635

* commit '4a826358e769e697ec329cf14edeb049981a11a9':
 2015-01-31 05:19:19 +00:00
Jon Larimer
4a826358e7 am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation automerge: 5c9d0de automerge: 9e7e8af 
automerge: 27d099a

* commit '27d099a7e128744b7a11ce09b469a3396e872d33':
 2015-01-31 05:03:24 +00:00
Joe Fernandez
14437e4781 am 1a9bf5c1: Merge "docs: training intent doc error update" into lmp-docs automerge: f02a8d9 automerge: cacf7da automerge: 346a9a2 
automerge: f4b2bd4

* commit 'f4b2bd4c41233327f0fb2e4d45af8dc9c8eba689':
  docs: training intent doc error update
 2015-01-31 04:20:19 +00:00
Deepanshu Gupta
df5a198710 am 3d5535cf: Merge "Limited AppCompat support" into lmp-dev automerge: 7789447 automerge: 580937f 
automerge: c053438

* commit 'c05343828611ed0b82fae4edf7fe11e0e9087db1':
  Limited AppCompat support
 2015-01-31 04:18:58 +00:00
Deepanshu Gupta
6a439908fc am 1d59871e: Merge "Resource resolution fixes." into lmp-dev automerge: 7e683bd automerge: 1575ca6 
automerge: 862cdd6

* commit '862cdd6f11490c060842599a58a400e284c937d9':
  Resource resolution fixes.
 2015-01-31 04:17:35 +00:00
Joe Fernandez
f4b2bd4c41 am 1a9bf5c1: Merge "docs: training intent doc error update" into lmp-docs automerge: f02a8d9 automerge: cacf7da 
automerge: 346a9a2

* commit '346a9a2f364f7cdabf06944014594b299d384082':
  docs: training intent doc error update
 2015-01-31 04:01:11 +00:00
Deepanshu Gupta
c053438286 am 3d5535cf: Merge "Limited AppCompat support" into lmp-dev automerge: 7789447 
automerge: 580937f

* commit '580937fc45bc5ef97e45f1eaf67945a07c5ce41f':
  Limited AppCompat support
 2015-01-31 03:59:37 +00:00
Deepanshu Gupta
862cdd6f11 am 1d59871e: Merge "Resource resolution fixes." into lmp-dev automerge: 7e683bd 
automerge: 1575ca6

* commit '1575ca6e1a713f9d2e4a9f91bc6943ae10fde083':
  Resource resolution fixes.
 2015-01-31 03:58:26 +00:00
Jon Larimer
27d099a7e1 am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation automerge: 5c9d0de 
automerge: 9e7e8af

* commit '9e7e8afbb934742cb7996b22e32f94c1c09704af':
 2015-01-31 03:39:19 +00:00
Joe Fernandez
346a9a2f36 am 1a9bf5c1: Merge "docs: training intent doc error update" into lmp-docs automerge: f02a8d9 
automerge: cacf7da

* commit 'cacf7da1c4d078641f099bab717e155609c5dc99':
  docs: training intent doc error update
 2015-01-31 03:04:16 +00:00
Deepanshu Gupta
580937fc45 am 3d5535cf: Merge "Limited AppCompat support" into lmp-dev 
automerge: 7789447

* commit '7789447bd97c851b7a09623a417300590e5439d5':
  Limited AppCompat support
 2015-01-31 03:02:42 +00:00
Deepanshu Gupta
1575ca6e1a am 1d59871e: Merge "Resource resolution fixes." into lmp-dev 
automerge: 7e683bd

* commit '7e683bdaddff77a24a36d420c5782b47795c5ccb':
  Resource resolution fixes.
 2015-01-31 03:01:20 +00:00
Joe Fernandez
cacf7da1c4 am 1a9bf5c1: Merge "docs: training intent doc error update" into lmp-docs 
automerge: f02a8d9

* commit 'f02a8d9ffcd2f14c069b23d588ff2083cc53062d':
  docs: training intent doc error update
 2015-01-31 02:50:57 +00:00
Joe Fernandez
f02a8d9ffc am 1a9bf5c1: Merge "docs: training intent doc error update" into lmp-docs 
* commit '1a9bf5c10049e99398a80b985e22ea1bfd737bcd':
  docs: training intent doc error update
 2015-01-31 01:59:54 +00:00
Joe Fernandez
1a9bf5c100 Merge "docs: training intent doc error update" into lmp-docs 2015-01-31 01:00:16 +00:00
Rich Slogar
367bfb3b50 docs: training intent doc error update 
b/18386294

Change-Id: Id0fb07e567e0f698e786ac57a19c60895f4d6fc1
 2015-01-30 16:55:55 -08:00
Deepanshu Gupta
7789447bd9 am 3d5535cf: Merge "Limited AppCompat support" into lmp-dev 
* commit '3d5535cfb7755c20619529649b025c4682013b85':
  Limited AppCompat support
 2015-01-31 00:54:10 +00:00
Deepanshu Gupta
7e683bdadd am 1d59871e: Merge "Resource resolution fixes." into lmp-dev 
* commit '1d59871e4e8a3a657dab3931d684706c45630a2f':
  Resource resolution fixes.
 2015-01-31 00:54:07 +00:00
Deepanshu Gupta
3d5535cfb7 Merge "Limited AppCompat support" into lmp-dev 2015-01-31 00:50:35 +00:00
Deepanshu Gupta
1d59871e4e Merge "Resource resolution fixes." into lmp-dev 2015-01-31 00:48:57 +00:00
Joe Fernandez
52c39c27e9 am 5c37c8e6: am d801a123: am 2b68ab3a: Merge "docs: studio emulator platform update" into lmp-docs automerge: 3548de6 
automerge: 95fa882

* commit '95fa88250a1957c7adfbd35d52f62e42cbe03df6':
  docs: studio emulator platform update
 2015-01-31 00:29:37 +00:00
Joe Fernandez
95fa88250a am 5c37c8e6: am d801a123: am 2b68ab3a: Merge "docs: studio emulator platform update" into lmp-docs 
automerge: 3548de6

* commit '3548de60735a79d3e7087c26ae491a7f38da5b4d':
  docs: studio emulator platform update
 2015-01-31 00:25:04 +00:00
Joe Fernandez
3548de6073 am 5c37c8e6: am d801a123: am 2b68ab3a: Merge "docs: studio emulator platform update" into lmp-docs 
* commit '5c37c8e66227b15d471047e7c4c986cf3c67876a':
  docs: studio emulator platform update
 2015-01-31 00:14:39 +00:00
Jon Larimer
9e7e8afbb9 am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation 
automerge: 5c9d0de

* commit '5c9d0de174caf151937f19aa6898f60bce3fb4f4':
  Fix build breakage in older branches by avoiding <> notation
 2015-01-31 00:05:54 +00:00
Joe Fernandez
5c37c8e662 am d801a123: am 2b68ab3a: Merge "docs: studio emulator platform update" into lmp-docs 
* commit 'd801a1238392b8c7a8e0131cee89370143363046':
  docs: studio emulator platform update
 2015-01-30 23:41:10 +00:00
Joe Fernandez
d801a12383 am 2b68ab3a: Merge "docs: studio emulator platform update" into lmp-docs 
* commit '2b68ab3adda1ecce045b7b56b8c37ab4d960d2b4':
  docs: studio emulator platform update
 2015-01-30 23:34:44 +00:00