Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge "Zen: Maintain source filters for both calls and messages." into mnc-dev | John Spurlock | 2015-05-06 | 2 | -13/+15 |
|\ | |||||
| * | Zen: Maintain source filters for both calls and messages. | John Spurlock | 2015-05-05 | 2 | -13/+15 |
* | | Merge "Permission policies are for profile and device owners" into mnc-dev | Amith Yamasani | 2015-05-06 | 1 | -2/+2 |
|\ \ | |||||
| * | | Permission policies are for profile and device owners | Amith Yamasani | 2015-05-05 | 1 | -2/+2 |
* | | | Merge "The voice assist may now be launched above the lockscreen" into mnc-dev | Selim Cinek | 2015-05-05 | 2 | -1/+39 |
|\ \ \ | |_|/ |/| | | |||||
| * | | The voice assist may now be launched above the lockscreen | Selim Cinek | 2015-05-05 | 2 | -1/+39 |
* | | | Only enable fingerprint auth after first regular auth | Jorim Jaggi | 2015-05-05 | 1 | -12/+47 |
* | | | Merge "Call profile changed in cases were focused activity is nulled." into m... | Kenny Guy | 2015-05-05 | 1 | -2/+20 |
|\ \ \ | |||||
| * | | | Call profile changed in cases were focused activity is nulled. | Kenny Guy | 2015-04-30 | 1 | -2/+20 |
* | | | | Merge "Permission UI - legacy apps support" into mnc-dev | Svet Ganov | 2015-05-05 | 3 | -46/+12 |
|\ \ \ \ | |||||
| * | | | | Permission UI - legacy apps support | Svet Ganov | 2015-05-05 | 3 | -46/+12 |
* | | | | | Merge "Zen: Remove calendar rule attendance attribute." into mnc-dev | John Spurlock | 2015-05-05 | 1 | -30/+8 |
|\ \ \ \ \ | |||||
| * | | | | | Zen: Remove calendar rule attendance attribute. | John Spurlock | 2015-05-05 | 1 | -30/+8 |
* | | | | | | Remove dead code from IMMS. | Seigo Nonaka | 2015-05-05 | 1 | -20/+7 |
| |_|_|/ / |/| | | | | |||||
* | | | | | Merge changes from topic 'mwd-merge-050415' into mnc-dev | Prerepa Viswanadham | 2015-05-05 | 5 | -10/+41 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge commit '17455a3' into master_merge | Prerepa Viswanadham | 2015-05-01 | 1 | -3/+9 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merge "Added parameter to avoid having a stream opened, and with that, file t... | Vinit Deshpande | 2015-04-28 | 1 | -3/+9 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Added parameter to avoid having a stream opened, | Jan Nordqvist | 2015-04-23 | 1 | -3/+9 |
| | * | | | | | | am 28358eae: Merge "Fixing to fail android.JobScheduler.TimingConstraintsTest... | Matthew Williams | 2015-04-23 | 1 | -0/+6 |
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||||
| | | * | | | | | am 28358eae: Merge "Fixing to fail android.JobScheduler.TimingConstraintsTest... | Matthew Williams | 2015-04-23 | 1 | -0/+6 |
| | | |\ \ \ \ \ | |||||
| | | * \ \ \ \ \ | am f61aee97: Merge "[DO NOT MERGE] Fixed NPE when trying to animate a window ... | Wale Ogunwale | 2015-04-23 | 1 | -2/+6 |
| | | |\ \ \ \ \ \ | |||||
| | * | | | | | | | | Always send the DHCP client identifier. | Lorenzo Colitti | 2015-04-22 | 5 | -14/+19 |
| | * | | | | | | | | Log DHCP replies that we can't parse. | Lorenzo Colitti | 2015-04-22 | 1 | -0/+4 |
| | * | | | | | | | | Merge "Final removal of CONNECTIVITY_ACTION_IMMEDIATE." into m-wireless-dev | Erik Kline | 2015-04-22 | 1 | -5/+0 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | Final removal of CONNECTIVITY_ACTION_IMMEDIATE. | Erik Kline | 2015-04-22 | 1 | -5/+0 |
| * | | | | | | | | | | am 4ee45178: am dbb03371: am 6e761c5d: Merge "Device policy: use owner label ... | Robin Lee | 2015-05-01 | 1 | -8/+32 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | am dbb03371: am 6e761c5d: Merge "Device policy: use owner label instead of na... | Robin Lee | 2015-05-01 | 1 | -8/+32 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ \ \ \ \ | am c869bbfd: am 50b37f8c: am c90c7604: Merge "Honor Ble scanning settings fro... | Wei Wang | 2015-05-01 | 1 | -0/+11 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |||||
| | * | | | | | | | | | | | am 50b37f8c: am c90c7604: Merge "Honor Ble scanning settings from Settings UI... | Wei Wang | 2015-05-01 | 1 | -0/+11 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ \ \ \ \ \ | am 0385dc8d: am 1d8aae3b: am db672b03: Merge "Change how Java Bitmaps are acc... | John Reck | 2015-05-01 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | am 1d8aae3b: am db672b03: Merge "Change how Java Bitmaps are accessed in a fe... | John Reck | 2015-04-30 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ \ \ \ \ \ \ | resolved conflicts for merge of 04f2fe39 to master | Mady Mellor | 2015-04-30 | 1 | -0/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | am d73f05f5: am 2619ef39: Merge "Add onStylusButtonPress listener to View" in... | Mady Mellor | 2015-04-30 | 1 | -0/+8 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ | am cae8686c: am 0165cf4d: am 3327f3d6: Merge "Add use fingerprint app op - fr... | Svetoslav | 2015-04-30 | 1 | -12/+37 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | am 0165cf4d: am 3327f3d6: Merge "Add use fingerprint app op - framework" into... | Svetoslav | 2015-04-30 | 1 | -12/+37 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am c8efc449: am 3d42d238: am f764d219: Merge "AudioService receives callback ... | Jean-Michel Trivi | 2015-04-30 | 1 | -7/+46 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | | am 3d42d238: am f764d219: Merge "AudioService receives callback for dynamic p... | Jean-Michel Trivi | 2015-04-30 | 1 | -7/+46 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 0f4c6a8b: am 1642e354: am 8f72b403: Merge "Zen: New event condition data m... | John Spurlock | 2015-04-30 | 5 | -10/+151 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | | | am 1642e354: am 8f72b403: Merge "Zen: New event condition data model." into m... | John Spurlock | 2015-04-30 | 5 | -10/+151 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 2aab6de5: am 795ec677: am 780a9b9e: Merge "Fix potential NPE on devices wi... | Zoltan Szatmary-Ban | 2015-04-30 | 1 | -3/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | | | | am 795ec677: am 780a9b9e: Merge "Fix potential NPE on devices without DPMS" i... | Zoltan Szatmary-Ban | 2015-04-30 | 1 | -3/+4 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am f225e6c6: am 550ab61c: am dc4ad271: Merge "Add package name extra to Packa... | Benjamin Franz | 2015-04-30 | 2 | -1/+12 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | | | | | am 550ab61c: am dc4ad271: Merge "Add package name extra to PackageInstaller c... | Benjamin Franz | 2015-04-30 | 2 | -1/+12 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am a54020c7: am 508c9fec: am 21df222f: Merge "New "frozen" state during app m... | Jeff Sharkey | 2015-04-30 | 4 | -51/+95 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | | | | | | am 508c9fec: am 21df222f: Merge "New "frozen" state during app move/upgrade."... | Jeff Sharkey | 2015-04-30 | 4 | -51/+95 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am df7f02b6: am ad61b833: Merge "Fix no vibration during shutdown." | John Spurlock | 2015-04-30 | 2 | -5/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | | | | | | | am ad61b833: Merge "Fix no vibration during shutdown." | John Spurlock | 2015-04-30 | 2 | -5/+6 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge "Fix no vibration during shutdown." | John Spurlock | 2015-04-30 | 2 | -5/+6 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | | | | | | | | | | | Fix no vibration during shutdown. | riddle_hsu | 2015-03-18 | 2 | -5/+6 |
| * | | | | | | | | | | | | | | | | | | | | | | | am 21a30889: am 1df4dca2: am 9e98dce6: Merge "Returning to wizard, split move... | Jeff Sharkey | 2015-04-30 | 2 | -34/+112 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / |