Ricardo Cervera
e7db83426e
am d850be5d: am 7c05fd85: am 59ab011e: am 0e286ab1: Merge "docs: Removed outdated troubleshooting guidelines for Android Studio" into klp-docs
...
* commit 'd850be5d1491d255a64db9bc95334748e455c782':
docs: Removed outdated troubleshooting guidelines for Android Studio
2014-05-15 00:00:53 +00:00
Mathieu Chartier
ddfe0c77b4
am 760f0994: am c0f18b9d: am c4c77d63: Merge "Add property for background GC type"
...
* commit '760f0994db69b77d06814194beecaca1de330855':
Add property for background GC type
2014-05-15 00:00:48 +00:00
Ian Rogers
f50742b12d
am 76ee05d4: am d05c7d26: am bcf76242: Merge "Move FLATTENED_PATTERN to inner class."
...
* commit '76ee05d4f6a8ddafd2125db69e7560dab7cb2e8a':
Move FLATTENED_PATTERN to inner class.
2014-05-15 00:00:42 +00:00
John Reck
3eb9882a67
Merge "Disable texture atlas"
2014-05-14 23:59:14 +00:00
John Reck
cdfeef6624
Disable texture atlas
...
Bug: 14952384
Change-Id: If38b3e4c08c2c3dd9c00ae9e6e8c10e208e737d1
2014-05-14 23:59:01 +00:00
Ricardo Cervera
d850be5d14
am 7c05fd85: am 59ab011e: am 0e286ab1: Merge "docs: Removed outdated troubleshooting guidelines for Android Studio" into klp-docs
...
* commit '7c05fd850bfbbbe9139a958102494260b5e6dea2':
docs: Removed outdated troubleshooting guidelines for Android Studio
2014-05-14 23:57:12 +00:00
Mathieu Chartier
760f0994db
am c0f18b9d: am c4c77d63: Merge "Add property for background GC type"
...
* commit 'c0f18b9d0cce0c140b1274055faabff732f1e27c':
Add property for background GC type
2014-05-14 23:56:13 +00:00
Ian Rogers
76ee05d4f6
am d05c7d26: am bcf76242: Merge "Move FLATTENED_PATTERN to inner class."
...
* commit 'd05c7d265170ca6573bbdd97f3c4aaa8e25a6389':
Move FLATTENED_PATTERN to inner class.
2014-05-14 23:56:06 +00:00
Ricardo Cervera
7c05fd850b
am 59ab011e: am 0e286ab1: Merge "docs: Removed outdated troubleshooting guidelines for Android Studio" into klp-docs
...
* commit '59ab011eebc5deb008ae62c0fe353d6d0aac8ab8':
docs: Removed outdated troubleshooting guidelines for Android Studio
2014-05-14 23:53:20 +00:00
Mathieu Chartier
c0f18b9d0c
am c4c77d63: Merge "Add property for background GC type"
...
* commit 'c4c77d63d889baca2abbdce6326077f0911b279e':
Add property for background GC type
2014-05-14 23:52:02 +00:00
Ian Rogers
d05c7d2651
am bcf76242: Merge "Move FLATTENED_PATTERN to inner class."
...
* commit 'bcf76242134317a2f722eab5af2600fe2858f895':
Move FLATTENED_PATTERN to inner class.
2014-05-14 23:51:59 +00:00
Ricardo Cervera
59ab011eeb
am 0e286ab1: Merge "docs: Removed outdated troubleshooting guidelines for Android Studio" into klp-docs
...
* commit '0e286ab1f0eaeb2bb75c7a76ff8f3d08267e7fc3':
docs: Removed outdated troubleshooting guidelines for Android Studio
2014-05-14 23:49:24 +00:00
Adam Powell
38d3ccc65d
Merge "Fix layout positioning for Toolbar"
2014-05-14 23:49:20 +00:00
Adam Powell
7a8a284d46
Fix layout positioning for Toolbar
...
Fix a bug where the starting position was not properly updated for the
previous view's measured width.
Bug 14900794
Change-Id: I6064c5353abc83159cd4c7d6ccfce64640735791
2014-05-14 16:38:46 -07:00
ztenghui
a6464b38fc
Merge "Check the array before accessing it"
2014-05-14 23:15:22 +00:00
Mathieu Chartier
c4c77d63d8
Merge "Add property for background GC type"
2014-05-14 23:07:39 +00:00
Mathieu Chartier
c01936a686
Add property for background GC type
...
To disable background compaction do:
adb shell setprop dalvik.vm.backgroundgctype CMS
To enable:
adb shell setprop dalvik.vm.backgroundgctype SS
Change-Id: I1d87b95fceaedac4df5ce6e718d7c14b35d524cc
2014-05-14 15:45:48 -07:00
Ricardo Cervera
0e286ab1f0
Merge "docs: Removed outdated troubleshooting guidelines for Android Studio" into klp-docs
2014-05-14 22:44:57 +00:00
Ian Rogers
bcf7624213
Merge "Move FLATTENED_PATTERN to inner class."
2014-05-14 22:40:58 +00:00
Ian Rogers
5d5d14fd97
Move FLATTENED_PATTERN to inner class.
...
Avoid AOT compilation/initialization in ART failing due to regex.Pattern
requiring native support.
Bug: 14646037
Change-Id: I9d9c7fd9ed9fab7e21d37f9b31c00d037fc5a691
2014-05-14 15:29:46 -07:00
Evan Charlton
4a644e3903
Merge "Remove obsolete ThirdPartyCall APIs"
2014-05-14 22:08:21 +00:00
Evan Charlton
fcca6cd019
Merge "Revert "Expose sendEnvelope.""
2014-05-14 22:08:10 +00:00
Evan Charlton
605e4942d6
Merge "Revert "Modify TelephonyManager to expose sendEnvelopeWithStatus instead of sendEnvelope.""
2014-05-14 22:07:47 +00:00
Evan Charlton
0082e3302f
Remove obsolete ThirdPartyCall APIs
...
These should have been reverted long ago. Additional cleanup will need
to happen, but this is a good first pass.
Change-Id: I6d3c2919299c0a0b9714ffecd30da68e5c880b6a
2014-05-14 15:05:47 -07:00
Jinsuk Kim
02adbb1506
Merge "Add a new resource for HDMI-CEC logical device type definition"
2014-05-14 22:02:06 +00:00
Dirk Dougherty
f8f018ba5c
am ae4388f7: am 0f582284: am 980a285b: am 5eb99943: Merge "update wear reference docs to support sticky nav. DO NOT SUBMIT UNTIL DYNAMIC TEMPLATE IS MERGED." into klp-docs
...
* commit 'ae4388f794d3ba4087f65b528eba06d5015c9c9a':
update wear reference docs to support sticky nav. DO NOT SUBMIT UNTIL DYNAMIC TEMPLATE IS MERGED.
2014-05-14 21:54:27 +00:00
Dirk Dougherty
e221e7a7fb
Merge "resolved conflices for merge of 93ccd1a2 to master"
2014-05-14 21:52:28 +00:00
Dirk Dougherty
9a6672beb1
resolved conflices for merge of 93ccd1a2 to master
...
Change-Id: Ic77367cb9c90027e036a461697295fd604b50014
2014-05-14 14:50:13 -07:00
Sreeram Ramachandran
1fdc902cc5
Merge "Fix reboot loop due to NPE."
2014-05-14 21:48:31 +00:00
David Christie
3c9a0e7928
Merge "Fix typo in comment"
2014-05-14 21:45:44 +00:00
Sreeram Ramachandran
4696ee488b
Fix reboot loop due to NPE.
...
All that's old is new again: http://ag/63748 .
Change-Id: I83df48447dbcb7f6edf02bd07abf721b009afa49
2014-05-14 14:45:00 -07:00
Andrew Lee
4268b243de
Merge "Handle normalization of a "null" phone number."
2014-05-14 21:44:39 +00:00
David Christie
00dc056b61
Fix typo in comment
...
Change-Id: I880385f250d95ad9eea1c39bdf126797177e00a1
2014-05-14 14:28:54 -07:00
Dirk Dougherty
ae4388f794
am 0f582284: am 980a285b: am 5eb99943: Merge "update wear reference docs to support sticky nav. DO NOT SUBMIT UNTIL DYNAMIC TEMPLATE IS MERGED." into klp-docs
...
* commit '0f5822847ae3422d939a7959f6a25178fcc12232':
update wear reference docs to support sticky nav. DO NOT SUBMIT UNTIL DYNAMIC TEMPLATE IS MERGED.
2014-05-14 21:24:29 +00:00
Dirk Dougherty
93ccd1a2eb
am 0540bc37: am a4e6c7d1: am 3506ac87: Doc change: Updated content for distribute.
...
* commit '0540bc373c84b4ab590708cc9f79c95eeac5114c':
Doc change: Updated content for distribute.
2014-05-14 21:24:24 +00:00
Dirk Dougherty
0f5822847a
am 980a285b: am 5eb99943: Merge "update wear reference docs to support sticky nav. DO NOT SUBMIT UNTIL DYNAMIC TEMPLATE IS MERGED." into klp-docs
...
* commit '980a285b4c29254fd65b0426256918ae2b5eea85':
update wear reference docs to support sticky nav. DO NOT SUBMIT UNTIL DYNAMIC TEMPLATE IS MERGED.
2014-05-14 21:21:23 +00:00
Dirk Dougherty
0540bc373c
am a4e6c7d1: am 3506ac87: Doc change: Updated content for distribute.
...
* commit 'a4e6c7d1d4e6c8ca2b50f91ae8881fb4838d7955':
Doc change: Updated content for distribute.
2014-05-14 21:21:15 +00:00
Dirk Dougherty
980a285b4c
am 5eb99943: Merge "update wear reference docs to support sticky nav. DO NOT SUBMIT UNTIL DYNAMIC TEMPLATE IS MERGED." into klp-docs
...
* commit '5eb99943d5cf4ad32c61d94e944c155d1c77a915':
update wear reference docs to support sticky nav. DO NOT SUBMIT UNTIL DYNAMIC TEMPLATE IS MERGED.
2014-05-14 21:17:27 +00:00
Dirk Dougherty
a4e6c7d1d4
am 3506ac87: Doc change: Updated content for distribute.
...
* commit '3506ac87c09c0748d92ef594c94365a5d7b07262':
Doc change: Updated content for distribute.
2014-05-14 21:17:22 +00:00
Dirk Dougherty
5eb99943d5
Merge "update wear reference docs to support sticky nav. DO NOT SUBMIT UNTIL DYNAMIC TEMPLATE IS MERGED." into klp-docs
2014-05-14 21:16:31 +00:00
Dirk Dougherty
3506ac87c0
Doc change: Updated content for distribute.
...
Change-Id: I612fbb8e5b7aedd73c0e633e5517bb89375760ed
2014-05-14 14:10:51 -07:00
ztenghui
f11310f395
Check the array before accessing it
...
TODO: Figure out why the path is generating empty polygon.
bug: 14615368
Change-Id: If116e34388b7c6a71bf5ddd36e0c9716d7450732
2014-05-14 21:02:45 +00:00
Evan Charlton
8f402c36cb
Revert "Expose sendEnvelope."
...
This reverts commit 6eac2ee0fc8a652c4cb1e7ca6602a080d4f82dbd.
Change-Id: Ie04a873bb1d4935208e687917e86cbe80312a6d1
2014-05-14 14:02:21 -07:00
Evan Charlton
c0d138ab86
Revert "Modify TelephonyManager to expose sendEnvelopeWithStatus instead of sendEnvelope."
...
This reverts commit 37384dedab38239433a41641fe87fc3e51bb6976.
2014-05-14 14:01:47 -07:00
Adam Lesinski
f8c940733e
Merge "Fix potential crash in libandroidfw"
2014-05-14 20:30:09 +00:00
Ed Heyl
2cf184233b
merge master nova by hand, skipped translations
...
Change-Id: I4bea0bb9e375361f21d995bf4698d5eb6300ecfb
2014-05-14 13:24:53 -07:00
Andrew Lee
b31c310fcf
Handle normalization of a "null" phone number.
...
Bug: 14900155
Change-Id: I1c4c5c6dec4c4c470b436102c72a7476d3d5237c
2014-05-14 13:00:28 -07:00
Michael Wright
92ddeeab47
Merge "Remove reflection from InputEventConsistencyVerifier ctor."
2014-05-14 19:50:49 +00:00
Michael Wright
fa28b98447
Merge "Only translate prefixed strings to keys / axes."
2014-05-14 19:43:16 +00:00
Chris Wren
154f828365
Merge "Add intrusiveness signal extractor."
2014-05-14 19:30:13 +00:00