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
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
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
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
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
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
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
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
2015-01-31 04:01:11 +00:00
Deepanshu Gupta
c053438286
am 3d5535cf: Merge "Limited AppCompat support" into lmp-dev automerge: 7789447
...
automerge: 580937f
2015-01-31 03:59:37 +00:00
Deepanshu Gupta
862cdd6f11
am 1d59871e: Merge "Resource resolution fixes." into lmp-dev automerge: 7e683bd
...
automerge: 1575ca6
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
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
2015-01-31 03:04:16 +00:00
Deepanshu Gupta
580937fc45
am 3d5535cf: Merge "Limited AppCompat support" into lmp-dev
...
automerge: 7789447
2015-01-31 03:02:42 +00:00
Deepanshu Gupta
1575ca6e1a
am 1d59871e: Merge "Resource resolution fixes." into lmp-dev
...
automerge: 7e683bd
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
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
Wonsik Kim
b561ccedd8
audio: allow audio port cache update even when audio patches contain invalidated sources/sinks
...
When an audio device disconnects from Android, custom audio patches
containing the device become invalidated.
AudioManager::updateAudioPortCache() used to fail in that case, but
it causes onAudioPortListUpdated() event never gets called so that
the creator of the custom audio patch cannot update it. Let
updateAudioPortCached() succeed even in the case so that the entity
that created the audio patch can get notified.
Bug: 18909299
Change-Id: If4f6ed73f69213d792117fb42aec103ae2e50b79
2015-01-31 01:51:28 +00:00
Rich Slogar
453467ac9c
docs: studio training basics create and run project updates
...
b/18742781
Change-Id: I80a207e24330c1b073934d671b3b9c94b0fb28e0
2015-01-30 17:14:25 -08: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
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
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
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
Joe Fernandez
2b68ab3add
Merge "docs: studio emulator platform update" into lmp-docs
2015-01-30 23:25:51 +00:00
Jon Larimer
ff526fa710
am 3a6d8f54: am 90d5bd8d: am feb362a5: am a0d3bfbe: am 5c9d0de1: am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation
...
* commit '3a6d8f5473f2451a0bdf13d4cc1d31e419d23f0c':
Fix build breakage in older branches by avoiding <> notation
2015-01-30 22:40:17 +00:00
Jon Larimer
3a6d8f5473
am 90d5bd8d: am feb362a5: am a0d3bfbe: am 5c9d0de1: am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation
...
* commit '90d5bd8daab404afc50470f5c19ea725bd2466fe':
Fix build breakage in older branches by avoiding <> notation
2015-01-30 22:33:13 +00:00
Jon Larimer
90d5bd8daa
am feb362a5: am a0d3bfbe: am 5c9d0de1: am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation
...
* commit 'feb362a5d194b30226caf2efbaae77991007c65c':
Fix build breakage in older branches by avoiding <> notation
2015-01-30 22:24:43 +00:00
Stuart Scott
2e233d3066
am 712d5b3d: am 147b6a35: Merge "[DS] Correct the access method for telephony system property" into lmp-mr1-dev
...
* commit '712d5b3d582dfe8f7fb855ba98704c98e9441836':
[DS] Correct the access method for telephony system property
2015-01-30 22:24:25 +00:00
Jon Larimer
feb362a5d1
am a0d3bfbe: am 5c9d0de1: am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation
...
* commit 'a0d3bfbe8736fd638621ae48371b6e4e237ed4b1':
Fix build breakage in older branches by avoiding <> notation
2015-01-30 22:18:34 +00:00
Stuart Scott
712d5b3d58
am 147b6a35: Merge "[DS] Correct the access method for telephony system property" into lmp-mr1-dev
...
* commit '147b6a3522b7032ede24101f5ac32ec7d7afa9e9':
[DS] Correct the access method for telephony system property
2015-01-30 22:17:42 +00:00
Jinsuk Kim
7bc0929905
am 42e785fb: am 3457ae47: Merge "Revert "CEC: Let playback device switch TV input after bootup"" into lmp-mr1-dev
...
* commit '42e785fbf7dfa50096275cf1e6233247e9fc15f7':
Revert "CEC: Let playback device switch TV input after bootup"
2015-01-30 22:15:00 +00:00
Jon Larimer
a0d3bfbe87
am 5c9d0de1: am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation
...
* commit '5c9d0de174caf151937f19aa6898f60bce3fb4f4':
Fix build breakage in older branches by avoiding <> notation
2015-01-30 22:11:56 +00:00
Stuart Scott
147b6a3522
Merge "[DS] Correct the access method for telephony system property" into lmp-mr1-dev
2015-01-30 22:09:38 +00:00
Jinsuk Kim
42e785fbf7
am 3457ae47: Merge "Revert "CEC: Let playback device switch TV input after bootup"" into lmp-mr1-dev
...
* commit '3457ae4709c8444f8ff9cdaf5809d6164f3bd21a':
Revert "CEC: Let playback device switch TV input after bootup"
2015-01-30 22:06:09 +00:00
