Bill Yi
37d7e0ba65
Import translations. DO NOT MERGE am: 66333161bb -s ours
...
am: 77b50cef75 -s ours
Change-Id: Ie77db5506e553ab6280babbccb8aabf8bbd27cb7
2016-11-05 06:41:59 +00:00
Bill Yi
c1181542c9
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: b26e27dc4a -s ours
...
am: f6e16b8604 -s ours
Change-Id: Idc09dc274841228ccce97d9613438df2fa210ec7
2016-11-05 06:36:57 +00:00
Bill Yi
88a2847268
Import translations. DO NOT MERGE am: 0c1f10dd0c -s ours
...
am: eff51c8add -s ours
Change-Id: Ie3011999ec010370e5419520c225390132fa5b02
2016-11-05 06:36:04 +00:00
Bill Yi
2e85fedddb
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 04812a6025 -s ours
...
am: 7d0d794b6d -s ours
Change-Id: I360f2bf941318eff00eb2d506e6891ad24cae7bd
2016-11-05 06:35:18 +00:00
Bill Yi
e7efc13c55
Import translations. DO NOT MERGE am: b95efc83d1 -s ours
...
am: 6a928ed074 -s ours
Change-Id: Ib67371533356e5a27b1bf372d48d56027c6aa59c
2016-11-05 06:34:29 +00:00
Bill Yi
9c7e0654d0
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 79de6da289 -s ours
...
am: e8dba1f819 -s ours
Change-Id: Ie3a3eb70d555313a9bf2f794349e2aaa3e3162cb
2016-11-05 06:33:32 +00:00
Bill Yi
4b0eeddad2
Import translations. DO NOT MERGE am: fa38b27d50 -s ours
...
am: 345d96ec9d -s ours
Change-Id: I02900c7dcc8c60a588e776d456a2d9b3b7369bb7
2016-11-05 06:32:37 +00:00
Bill Yi
710eb2fe9d
Import translations. DO NOT MERGE am: c08a721c3a -s ours
...
am: 10f695e379 -s ours
Change-Id: I2d628a2e6162c92aa55cf8292180f13a9a2908f1
2016-11-05 06:31:41 +00:00
Bill Yi
77b50cef75
Import translations. DO NOT MERGE
...
am: 66333161bb -s ours
Change-Id: I9c0463771fcd102c7cef8dc6d8948829ead49de4
2016-11-05 06:28:27 +00:00
Bill Yi
f6e16b8604
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
...
am: b26e27dc4a -s ours
Change-Id: Ia37c90a128225718bc64f103382a0c7c7f35b635
2016-11-05 06:27:05 +00:00
Bill Yi
eff51c8add
Import translations. DO NOT MERGE
...
am: 0c1f10dd0c -s ours
Change-Id: Ia455a09086cac4a22b87591901562cf8e8ccf433
2016-11-05 06:26:59 +00:00
Bill Yi
7d0d794b6d
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
...
am: 04812a6025 -s ours
Change-Id: I35dce809cd8ce72a471b362c90c95cacb5f5036a
2016-11-05 06:24:03 +00:00
Bill Yi
6a928ed074
Import translations. DO NOT MERGE
...
am: b95efc83d1 -s ours
Change-Id: Ic6e7765e80c6ecd859b2b6508896ec38002dafc4
2016-11-05 06:23:53 +00:00
Bill Yi
e8dba1f819
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
...
am: 79de6da289 -s ours
Change-Id: I3dbae601af7f519aa58082f22b2e5a32b335b684
2016-11-05 06:22:12 +00:00
Bill Yi
345d96ec9d
Import translations. DO NOT MERGE
...
am: fa38b27d50 -s ours
Change-Id: I65a1609fcc6fbdd2ae3276e93f912c093fff539e
2016-11-05 06:22:02 +00:00
Bill Yi
10f695e379
Import translations. DO NOT MERGE
...
am: c08a721c3a -s ours
Change-Id: Ie1bd12ee925f08a7acdae5beab597ca26f7b0d5d
2016-11-05 06:20:46 +00:00
TreeHugger Robot
b26e27dc4a
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
2016-11-05 06:16:46 +00:00
TreeHugger Robot
04812a6025
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
2016-11-05 06:16:26 +00:00
TreeHugger Robot
79de6da289
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
2016-11-05 06:15:51 +00:00
Bill Yi
0c1f10dd0c
Import translations. DO NOT MERGE
...
Change-Id: I368b83de3f1f69d4e5a0d1aa8924105f4090a2bc
Auto-generated-cl: translation import
2016-11-04 21:52:09 -07:00
Bill Yi
fa38b27d50
Import translations. DO NOT MERGE
...
Change-Id: I36614103268c84b6660650ce9439b67a8df5041c
Auto-generated-cl: translation import
2016-11-04 20:39:08 -07:00
Bill Yi
c08a721c3a
Import translations. DO NOT MERGE
...
Change-Id: Iaa17b7930409ee4512ee5140c80ceb130c46aed8
Auto-generated-cl: translation import
2016-11-04 20:36:04 -07:00
Bill Yi
66333161bb
Import translations. DO NOT MERGE
...
Change-Id: I284c18a1b8cf79d9f8f6c67c0f6995509e39e8a8
Auto-generated-cl: translation import
2016-11-04 20:11:23 -07:00
Bill Yi
b95efc83d1
Import translations. DO NOT MERGE
...
Change-Id: I3e8e29579c2263ca2642bf70d0b8d25601452221
Auto-generated-cl: translation import
2016-11-04 20:05:23 -07:00
TreeHugger Robot
780b624fb5
Merge "Reference colorspace during creation of SkImageInfo"
2016-11-05 01:22:23 +00:00
Colin Cross
32478fb5ec
Merge "Move one more libandroidfw header" am: c5c74f9f49 am: e81eb61399 am: e1166dd488
...
am: 6d79e832fb -s ours
Change-Id: Icc4c7600d2ce3f33dc7ed7f1e8bc2dbd0fbfec98
2016-11-05 00:39:52 +00:00
Colin Cross
6d79e832fb
Merge "Move one more libandroidfw header" am: c5c74f9f49 am: e81eb61399
...
am: e1166dd488
Change-Id: I51b65b4eeea32af133ee9fb0528761d8fad2c5e6
2016-11-05 00:28:44 +00:00
Colin Cross
e1166dd488
Merge "Move one more libandroidfw header" am: c5c74f9f49
...
am: e81eb61399
Change-Id: I813a1f3c40681c92c7cc7bc27afd1344c15d0792
2016-11-05 00:21:41 +00:00
Colin Cross
e81eb61399
Merge "Move one more libandroidfw header"
...
am: c5c74f9f49
Change-Id: Ib4d1c81aba13543da2454140548252cf013c95e1
2016-11-05 00:15:01 +00:00
Colin Cross
c5c74f9f49
Merge "Move one more libandroidfw header"
2016-11-05 00:05:38 +00:00
Jeff Sharkey
623e155d53
Merge "Give easy flag to disable Direct Boot emulation."
2016-11-04 23:32:14 +00:00
Colin Cross
1d80addee4
Move one more libandroidfw header
...
The libandroidfw headers were moved into the library directory, move one
more that did not exist in the original patch.
Test: builds
Change-Id: Ic74a41558e1bc3984d98dd766f69d081edd8fc08
2016-11-04 15:49:43 -07:00
TreeHugger Robot
3e8431f1f2
Merge "Move IActivityManager to aidl."
2016-11-04 22:24:12 +00:00
John Reck
2fe57a0f9a
Merge "Re-unite sources with their headers" am: e43444a00b am: 946d11d216 am: b365b0db93
...
am: 68227128ac -s ours
Change-Id: Iaf5274b7151a42617f7a19c4e98cbd8829e8b612
2016-11-04 22:06:01 +00:00
John Reck
68227128ac
Merge "Re-unite sources with their headers" am: e43444a00b am: 946d11d216
...
am: b365b0db93
Change-Id: I5cbc54ea69e627a286fa1a2f855102146c3e044f
2016-11-04 21:57:05 +00:00
Marco Nelissen
9a9e54cfb7
Merge "Use libaudioclient"
2016-11-04 21:53:57 +00:00
John Reck
b365b0db93
Merge "Re-unite sources with their headers" am: e43444a00b
...
am: 946d11d216
Change-Id: Ib9fac5fff2f2ce90eebc2c6eb5208de33ea28723
2016-11-04 21:52:43 +00:00
John Reck
946d11d216
Merge "Re-unite sources with their headers"
...
am: e43444a00b
Change-Id: I8f3ef6a1ddcf78d28f7444b6e83c552b8305fd8c
2016-11-04 21:47:34 +00:00
Chad Brubaker
cbc59b8aa6
Merge "Move ephemeral apps into the ephemeral SELinux domain"
2016-11-04 21:46:16 +00:00
Fyodor Kupolov
0995958fa5
Merge "Do not call parseInt if value is empty"
2016-11-04 21:44:17 +00:00
Treehugger Robot
e43444a00b
Merge "Re-unite sources with their headers"
2016-11-04 21:41:01 +00:00
Stephen Chen
5963fd864b
Merge "Implement metered tracking for NetworkStats summary queries."
2016-11-04 21:29:33 +00:00
TreeHugger Robot
bdd90c8e5e
Merge "Unhide findPath() API. Add JavaDoc to related features."
2016-11-04 20:50:35 +00:00
Jeff Sharkey
00455bf0fe
Give easy flag to disable Direct Boot emulation.
...
Direct Boot emulation is encouraged to help developers test their
apps, but it's not required.
Test: cts-tradefed run cts-dev --module CtsAppSecurityHostTestCases --test android.appsecurity.cts.DirectBootHostTest#testDirectBootEmulated
Bug: 30686636
Change-Id: I3bb2dd42c0f71e52d8b7cf8da7e50568f41aafb7
2016-11-04 14:45:33 -06:00
John Reck
03b5d506bc
Re-unite sources with their headers
...
Move all the includes for androidfw under
a common base path for that library instead
of frameworks/base/includes.
Also fixes -Werror issues that resulted in
no longer being -isystem.
Test: builds
Change-Id: Ic4312eb61b197af114dded5691d5ae1ec82923f7
Merged-In: Ic4312eb61b197af114dded5691d5ae1ec82923f7
(cherry picked from commit f6113af2d6 )
2016-11-04 13:27:37 -07:00
Michael Kwan
ac7b7022e4
Merge "DO NOT MERGE ANYWHERE Add supports-multiwindow command to am." into cw-f-dev am: eed332bada -s ours am: 0c94d19c5d -s ours
...
am: 3045e6a3c7 -s ours
Change-Id: I53c09365ec2d81aa5147c00e9ec3b931dcc15778
2016-11-04 20:13:08 +00:00
Michael Kwan
2e91ff42d1
DO NOT MERGE ANYWHERE Add supports-multiwindow command to am. am: ef945b6706 -s ours am: db5045a8ba -s ours
...
am: aa3e93e397 -s ours
Change-Id: Ie1235a96130bffffd3e180a52c35fcff4a04ef24
2016-11-04 20:11:58 +00:00
Michael Kwan
3045e6a3c7
Merge "DO NOT MERGE ANYWHERE Add supports-multiwindow command to am." into cw-f-dev am: eed332bada -s ours
...
am: 0c94d19c5d -s ours
Change-Id: I767afec1a2633ac5fd5daf8b4cceeb8169a22bbe
2016-11-04 20:06:22 +00:00
Michael Kwan
aa3e93e397
DO NOT MERGE ANYWHERE Add supports-multiwindow command to am. am: ef945b6706 -s ours
...
am: db5045a8ba -s ours
Change-Id: I472face3a8e08b5ddc38cd2197469535cc89fe91
2016-11-04 20:05:25 +00:00
Michael Kwan
0c94d19c5d
Merge "DO NOT MERGE ANYWHERE Add supports-multiwindow command to am." into cw-f-dev
...
am: eed332bada -s ours
Change-Id: Ic30714c06a0865911c0e08682ccddd5d4b9ee6dc
2016-11-04 19:58:21 +00:00