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

237135 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Keun-young Park
19f517777b Merge "Revert "Revert "make isUiModeLocked, isNightModeLocked test api""" into nyc-dev am: 98e386f650 
am: b023406ab4

* commit 'b023406ab466224f6f8c8fc2c0f2c3717435a18d':
  Revert "Revert "make isUiModeLocked, isNightModeLocked test api""
 2016-03-02 17:36:13 +00:00
Geoff Mendal
21a1da4266 Merge "Import translations. DO NOT MERGE" into nyc-dev am: a793284540 -s ours 
am: 548963c2f4  -s ours

* commit '548963c2f4ecfe5f4d296a969114492a475a6d82':
  Import translations. DO NOT MERGE
 2016-03-02 17:23:22 +00:00
Keun-young Park
b023406ab4 Merge "Revert "Revert "make isUiModeLocked, isNightModeLocked test api""" into nyc-dev 
am: 98e386f650

* commit '98e386f650d5f6d05792d164e78ff3cbdbc5381e':
  Revert "Revert "make isUiModeLocked, isNightModeLocked test api""
 2016-03-02 17:22:53 +00:00
Keun-young Park
98e386f650 Merge "Revert "Revert "make isUiModeLocked, isNightModeLocked test api""" into nyc-dev 2016-03-02 17:12:42 +00:00
Geoff Mendal
548963c2f4 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: a793284540  -s ours

* commit 'a793284540e1ccba648871dafb1561dcffc8aa49':
  Import translations. DO NOT MERGE
 2016-03-02 16:56:37 +00:00
Calin Juravle
1389e993aa Merge "Simplify the error logs for profiles we can\'t open." into nyc-dev am: 3977f20d00 
am: 355a74150d

* commit '355a74150d3be8a86a7cea3d64d9be1aab442225':
  Simplify the error logs for profiles we can't open.
 2016-03-02 16:44:54 +00:00
Geoff Mendal
a793284540 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-03-02 16:38:50 +00:00
Calin Juravle
355a74150d Merge "Simplify the error logs for profiles we can\'t open." into nyc-dev 
am: 3977f20d00

* commit '3977f20d002c803f211599b44f457ff7dc3e7dd6':
  Simplify the error logs for profiles we can't open.
 2016-03-02 16:32:00 +00:00
Calin Juravle
3977f20d00 Merge "Simplify the error logs for profiles we can't open." into nyc-dev 2016-03-02 16:17:34 +00:00
Geoff Mendal
a7fe092a90 Merge "Import translations. DO NOT MERGE" into nyc-dev am: cc3cae5edf -s ours 
am: ba58cfd125  -s ours

* commit 'ba58cfd125a04173891bd7d8f8ab53f6838cba13':
  Import translations. DO NOT MERGE
 2016-03-02 15:57:07 +00:00
Geoff Mendal
fd7f8a743d Merge "Import translations. DO NOT MERGE" into nyc-dev am: 840d8f1446 -s ours 
am: bfe3c5ea65  -s ours

* commit 'bfe3c5ea65c5aa7cbc88ec0714a407cda02c677d':
  Import translations. DO NOT MERGE
 2016-03-02 15:55:29 +00:00
Geoff Mendal
744bb48c16 Merge "Import translations. DO NOT MERGE" into nyc-dev am: a865d5f4bb -s ours 
am: 74bf44fa54  -s ours

* commit '74bf44fa543167045b7264799f6e6ebab3b26242':
  Import translations. DO NOT MERGE
 2016-03-02 15:53:55 +00:00
Geoff Mendal
ba58cfd125 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: cc3cae5edf  -s ours

* commit 'cc3cae5edfd41336697c33c82b52a289896d35f7':
  Import translations. DO NOT MERGE
 2016-03-02 15:32:10 +00:00
Geoff Mendal
48a4eb1f81 Import translations. DO NOT MERGE 
Change-Id: I0b50c9fa731657538936e961e3c0fa1eaa594489
Auto-generated-cl: translation import
 2016-03-02 07:30:42 -08:00
Geoff Mendal
bfe3c5ea65 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 840d8f1446  -s ours

* commit '840d8f1446c4d1519cb3c1138ea45b7936e6cfc7':
  Import translations. DO NOT MERGE
 2016-03-02 15:30:32 +00:00
Geoff Mendal
74bf44fa54 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: a865d5f4bb  -s ours

* commit 'a865d5f4bb5730dd3af0ea50367916e30217b2b7':
  Import translations. DO NOT MERGE
 2016-03-02 15:28:31 +00:00
Geoff Mendal
cc3cae5edf Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-03-02 15:26:07 +00:00
Geoff Mendal
6c9af03fce Import translations. DO NOT MERGE 
Change-Id: I5f64277ff355790a3babb97dfeb37ecc892dfa71
Auto-generated-cl: translation import
 2016-03-02 07:25:28 -08:00
Geoff Mendal
840d8f1446 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-03-02 15:22:28 +00:00
Geoff Mendal
1ddc11be55 Import translations. DO NOT MERGE 
Change-Id: Id4836eb0d7454cbb028a40032ecd229e4a4d90d3
Auto-generated-cl: translation import
 2016-03-02 07:20:37 -08:00
Geoff Mendal
a865d5f4bb Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-03-02 15:20:16 +00:00
Narayan Kamath
08e3e66675 Merge "Track libcore change 2729b8c4d26170." am: 238e591be6 am: 9c4b2f6875 
am: 863c298852

* commit '863c2988525690768799fdfcaf59f7372e8ac523':
  Track libcore change 2729b8c4d26170.
 2016-03-02 15:16:06 +00:00
Geoff Mendal
a302da37a7 Import translations. DO NOT MERGE 
Change-Id: If6f96f29b8c300b1edc27cf0725dfe3492465e7d
Auto-generated-cl: translation import
 2016-03-02 07:14:03 -08:00
Narayan Kamath
863c298852 Merge "Track libcore change 2729b8c4d26170." am: 238e591be6 
am: 9c4b2f6875

* commit '9c4b2f68758817405671b85c788c5da5063985f4':
  Track libcore change 2729b8c4d26170.
 2016-03-02 15:02:40 +00:00
Narayan Kamath
cd9915884d Merge "Track libcore change 2729b8c4d26170." into nyc-dev am: 9d0aa47c65 
am: 09b59e113d

* commit '09b59e113d571e0d6bf0bc8eaf06620bfa86d96d':
  Track libcore change 2729b8c4d26170.
 2016-03-02 14:55:13 +00:00
Kenny Guy
8370a5a407 Merge "Don\'t clear widget providers from stopped profiles." into nyc-dev am: 153c30b747 
am: fdac3ed87d

* commit 'fdac3ed87d43dbd0aad6a44c474b3896e712dd9b':
  Don't clear widget providers from stopped profiles.
 2016-03-02 14:53:37 +00:00
Deepanshu Gupta
b5f879dca0 Merge "Add StubMethodAdapterTest" into nyc-dev am: 1aeb31bdbb 
am: 71281b53c8

* commit '71281b53c8a30d7e7cbdd406f8a95a11b8468cd1':
  Add StubMethodAdapterTest
 2016-03-02 14:52:00 +00:00
Geoff Mendal
85162a2bbb Merge "Import translations. DO NOT MERGE" into nyc-dev am: 7a0b6e5213 -s ours 
am: 294c49e71e  -s ours

* commit '294c49e71e52dfac85e1656a013a21525d79d5e1':
  Import translations. DO NOT MERGE
 2016-03-02 14:50:18 +00:00
Narayan Kamath
9c4b2f6875 Merge "Track libcore change 2729b8c4d26170." 
am: 238e591be6

* commit '238e591be6461f549a8020f4c3924d2a1abf868f':
  Track libcore change 2729b8c4d26170.
 2016-03-02 14:36:59 +00:00
Narayan Kamath
09b59e113d Merge "Track libcore change 2729b8c4d26170." into nyc-dev 
am: 9d0aa47c65

* commit '9d0aa47c656292eb97b583ea603d67bad1a376fe':
  Track libcore change 2729b8c4d26170.
 2016-03-02 14:29:45 +00:00
Kenny Guy
fdac3ed87d Merge "Don\'t clear widget providers from stopped profiles." into nyc-dev 
am: 153c30b747

* commit '153c30b747ef00c3e2bad75c7ab93a9405bcc051':
  Don't clear widget providers from stopped profiles.
 2016-03-02 14:27:43 +00:00
Narayan Kamath
9d0aa47c65 Merge "Track libcore change 2729b8c4d26170." into nyc-dev 2016-03-02 14:25:39 +00:00
Narayan Kamath
94825a16e0 Track libcore change 2729b8c4d26170. 
test-current.txt was regenerated on nyc-dev.

bug: 27423298

(cherry picked from commit b16a96538aa735c6926a95250fde2eca4b8e38ad)

Change-Id: Ieba7afaff407a421d3c2430f243151857cb42f97
 2016-03-02 14:18:30 +00:00
Kenny Guy
153c30b747 Merge "Don't clear widget providers from stopped profiles." into nyc-dev 2016-03-02 14:16:19 +00:00
Narayan Kamath
238e591be6 Merge "Track libcore change 2729b8c4d26170." 2016-03-02 14:14:50 +00:00
Geoff Mendal
cf13f0a7f6 Merge "Import translations. DO NOT MERGE" 2016-03-02 14:08:13 +00:00
Geoff Mendal
687aa42a51 Import translations. DO NOT MERGE 
Change-Id: I7abcf9b0931efc3fb6f3e6b6ac17b22aeeb83bb6
Auto-generated-cl: translation import
 2016-03-02 06:07:02 -08:00
Deepanshu Gupta
46a3931b9c LayoutLib: Reference android\'s junit in intellij project. am: dbe8a0fe3b 
am: e34ec294a0

* commit 'e34ec294a00fd33abddc3dfa88443492c2f6c075':
  LayoutLib: Reference android's junit in intellij project.
 2016-03-02 14:06:51 +00:00
Geoff Mendal
44ef0c4868 Merge "Import translations. DO NOT MERGE" 2016-03-02 14:03:59 +00:00
Geoff Mendal
5b1e4f1533 Import translations. DO NOT MERGE 
Change-Id: I3fd62cccd44999bb34631b181a8ede1ffe5b33e3
Auto-generated-cl: translation import
 2016-03-02 06:00:10 -08:00
Deepanshu Gupta
71281b53c8 Merge "Add StubMethodAdapterTest" into nyc-dev 
am: 1aeb31bdbb

* commit '1aeb31bdbb86faef361567e37a71fe500a8f19ac':
  Add StubMethodAdapterTest
 2016-03-02 13:55:32 +00:00
Geoff Mendal
294c49e71e Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 7a0b6e5213  -s ours

* commit '7a0b6e5213b3b717392c9f505fd55180fccfabf9':
  Import translations. DO NOT MERGE
 2016-03-02 13:53:58 +00:00
Geoff Mendal
d7457d9990 Merge "Import translations. DO NOT MERGE" 2016-03-02 13:53:58 +00:00
Deepanshu Gupta
e34ec294a0 LayoutLib: Reference android\'s junit in intellij project. 
am: dbe8a0fe3b

* commit 'dbe8a0fe3b4f01f7457aafc30783e50b77c33ff3':
  LayoutLib: Reference android's junit in intellij project.
 2016-03-02 13:52:22 +00:00
Geoff Mendal
7c0cbddf3e Import translations. DO NOT MERGE 
Change-Id: Ib585d2cab02a1d9ddc66d633a85eb590c65fc607
Auto-generated-cl: translation import
 2016-03-02 05:45:07 -08:00
Narayan Kamath
b16a96538a Track libcore change 2729b8c4d26170. 
bug: 27423298

Change-Id: I2d2eedd108896d5a027f06e159222a41bdcb3cb5
 2016-03-02 13:41:32 +00:00
Deepanshu Gupta
1aeb31bdbb Merge "Add StubMethodAdapterTest" into nyc-dev 2016-03-02 13:32:18 +00:00
Deepanshu Gupta
a9de835c17 Add StubMethodAdapterTest 
This tests the bugfix in StubMethodAdapter made in the change with id
I098996e43e330e995d33f12df1c16355bbc02f0f (commit 491523d)

Change-Id: I1ac897a49071dd9558bdc6b8abec29df913a6047
 2016-03-02 13:30:31 +00:00
Geoff Mendal
7a0b6e5213 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-03-02 13:28:44 +00:00
Deepanshu Gupta
dbe8a0fe3b LayoutLib: Reference android's junit in intellij project. 
Prevents errors due to mismatch in junit version.

Change-Id: I2adf32efb16472aa5f5e51025b6bb75afc76a8b4
 2016-03-02 13:26:18 +00:00