summaryrefslogtreecommitdiffstats
path: root/Android.mk
Commit message (Expand)AuthorAgeFilesLines
...
| | * Move preloaded-classes out of framework.jar.Ying Wang2014-11-171-3/+0
* | | am 83d0c86b: am d14f98fd: am 8638877f: Merge "Support collaborative audio foc...Jean-Michel Trivi2014-12-091-0/+2
|\ \ \ | |/ /
| * | Support collaborative audio focus handlingJean-Michel Trivi2014-12-051-0/+2
* | | am f4a76651: am 5f1ea2e6: am fb967585: Merge "Change the routing path of blue...Benjamin Franz2014-12-091-0/+1
|\ \ \ | |/ /
| * | Merge "Change the routing path of bluetooth headset connections." into lmp-mr...Benjamin Franz2014-12-051-0/+1
| |\ \
| | * | Change the routing path of bluetooth headset connections.Benjamin Franz2014-12-041-0/+1
* | | | Merge "MIDI Manager work in progress"Mike Lockwood2014-12-081-0/+2
|\ \ \ \
| * | | | MIDI Manager work in progressMike Lockwood2014-12-081-0/+2
* | | | | am 29ac679f: am dba26aa2: am 109ec376: Merge "new SMS/MMS carrier app API" in...Cheuksan Wang2014-12-041-4/+3
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge "new SMS/MMS carrier app API" into lmp-mr1-devCheuksan Wang2014-12-041-4/+3
| |\ \ \ \
| | * | | | new SMS/MMS carrier app APICheuksan Wang2014-12-011-4/+3
* | | | | | Merge "Allow compilation with Jack."Yohann Roussel2014-12-041-0/+2
|\ \ \ \ \ \
| * | | | | | Allow compilation with Jack.Yohann Roussel2014-11-131-0/+2
* | | | | | | am 8e78f0a7: am 9aa9e46b: am 5244ab68: am b769fc0c: am 512103d6: am 19275484:...Trevor Johns2014-12-031-1/+2
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | am b769fc0c: am 512103d6: am 19275484: Merge "Docs: Add "admin" to samples ca...Trevor Johns2014-12-031-1/+2
| |\ \ \ \ \ \
| | * | | | | | Docs: Add "admin" to samples categoriesTrevor Johns2014-12-021-1/+2
* | | | | | | | am fee5e3d3: am 50511096: am de9848c6: Merge "Initial changes to add callback...Winson Chung2014-12-031-0/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | / / / | |_|_|_|/ / / |/| | | | | |
| * | | | | | Initial changes to add callback on task stack changes. (Bug 17672056, Bug 182...Winson Chung2014-12-021-0/+1
| | |_|_|/ / | |/| | | |
* | | | | | am f1e6d231: am c5c2e537: Merge "resolved conflicts for merge of 803a6dc0 to ...Jorim Jaggi2014-11-261-0/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Make IKeyguardService interface asynchronousJim Miller2014-11-251-0/+1
| | |_|/ / | |/| | |
* | | | | am b4c54109: am 4f1cce63: am 12c2136e: Merge "Additional changes to Subscript...Wink Saville2014-11-241-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Additional changes to SubscriptionManager API as per API council.Wink Saville2014-11-221-1/+1
* | | | | am b5ba786c: am 18ab5c21: Merge "Add an API to check availability of Ethernet...Jaewan Kim2014-11-211-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Add an API to check availability of Ethernet interface." into lmp-mr1-devJaewan Kim2014-11-201-0/+1
| |\ \ \ \
| | * | | | Add an API to check availability of Ethernet interface.Jaewan Kim2014-11-201-0/+1
* | | | | | am 49414b5b: am 816e19eb: Merge "Revert "Additional changes to SubscriptionMa...Wink Saville2014-11-211-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Revert "Additional changes to SubscriptionManager API as per API council."Wink Saville2014-11-201-1/+1
* | | | | | am 07fb2457: am 4a57e908: Merge "Additional changes to SubscriptionManager AP...Wink Saville2014-11-211-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Additional changes to SubscriptionManager API as per API council.Wink Saville2014-11-191-1/+1
* | | | | | am c2045047: resolved conflicts for merge of 5c7bc931 to lmp-mr1-dev-plus-aospYing Wang2014-11-171-3/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Move preloaded-classes out of framework.jar.Ying Wang2014-11-171-3/+0
| |/ / / /
* | | | | am 0f064207: am 530f25d6: am fb8db1c8: Merge "new sms/mms carrier app API" in...Abhijith Shastry2014-11-141-0/+4
|\ \ \ \ \ | |/ / / /
| * | | | Merge "new sms/mms carrier app API" into lmp-mr1-devAbhijith Shastry2014-11-131-0/+4
| |\ \ \ \
| | * | | | new sms/mms carrier app APICheuksan Wang2014-11-121-0/+4
* | | | | | am 7b3b8804: am 8d6699cc: am 19865ccd: am 5d7f91c7: am 40ac90e9: am 1b657d92:...Renato Mangini2014-11-131-2/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 5d7f91c7: am 40ac90e9: am 1b657d92: Fix the order of sample categories lef...Renato Mangini2014-11-121-2/+2
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Fix the order of sample categories left nav.Renato Mangini2014-11-121-2/+2
* | | | | | am 68fde80a: am 2a3ce185: am ca011519: am a53b8bad: am 4b7b68d8: Add "notific...Renato Mangini2014-11-121-1/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am ca011519: am a53b8bad: am 4b7b68d8: Add "notification" category for samples.Renato Mangini2014-11-121-1/+2
| |\ \ \ \ \ | | |/ / / /
| | * | | | Add "notification" category for samples.Renato Mangini2014-11-111-1/+2
| | |/ / /
* | | | | SubInfoRecord.aidl renamed to SubscriptionInfo.aidlWink Saville2014-11-121-1/+1
* | | | | am 6fafa8cd: am 36d059f9: am 138b8334: Obliterate LockPatternUtilsCacheAdrian Roos2014-11-121-1/+0
|\ \ \ \ \ | |/ / / /
| * | | | Obliterate LockPatternUtilsCacheAdrian Roos2014-11-121-1/+0
* | | | | am 93fc415e: Merge "Update SubscriptionManager API as per API council." into ...Wink Saville2014-11-121-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | Update SubscriptionManager API as per API council.Wink Saville2014-11-111-0/+1
* | | | | am 95ef0ac7: am 525da301: am 85d558cd: Add Activity API to get referrer infor...Dianne Hackborn2014-11-111-0/+1
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | |
| * | | Add Activity API to get referrer information.Dianne Hackborn2014-11-111-0/+1
| |/ /
* | | am 2cf2406d: am 86272c9c: am 4c24abe9: am 2988436b: am fb28bd15: Merge "Docs:...Trevor Johns2014-10-231-1/+2
|\ \ \ | |/ /
| * | Docs: Add TOC page for Wearable samplesTrevor Johns2014-10-231-1/+2
| |/
* | am 7468bb98: am e3d3aa3f: am df88ad0b: am e8a700e9: am 843e2343: Add WindowMa...Evan Charlton2014-10-161-0/+1
|\ \ | |/