OSDN Git Service
Ajay Panicker [Tue, 20 Sep 2016 23:56:57 +0000 (23:56 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am:
3ccc668ff8
am:
2c3e8b5898
Change-Id: Iddbee8b99be3c4e5c4305d9172ef7f23880a12f6
Ajay Panicker [Tue, 20 Sep 2016 23:49:08 +0000 (23:49 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2)
am:
3ccc668ff8
Change-Id: I5932ce563c8858824a6aa8732f13aecb00d9099e
Ajay Panicker [Thu, 8 Sep 2016 17:55:51 +0000 (10:55 -0700)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2)
setPairingConfirmation was set to only require BLUETOOTH_ADMIN
permission which shouldn't be able to set the confirmation itself.
This is restricted to BLUETOOTH_PRIVILEGED permission.
Bug:
29043989
Change-Id: Iae8e31b25795989446265fdcc5eb27e6ffaf29aa
Miao Chou [Sat, 8 Aug 2015 00:23:30 +0000 (00:23 +0000)]
am
ef9b774c: am
0f6aaa5a: DO NOT MERGE Fix security vulnerabilities in permission of deleting MMS/SMS
* commit '
ef9b774c992cbff61502a3eb6c680862db26a468':
DO NOT MERGE Fix security vulnerabilities in permission of deleting MMS/SMS
Miao Chou [Sat, 8 Aug 2015 00:17:47 +0000 (00:17 +0000)]
am
0f6aaa5a: DO NOT MERGE Fix security vulnerabilities in permission of deleting MMS/SMS
* commit '
0f6aaa5a945345b273bce16429c5ac56f3d1e7a9':
DO NOT MERGE Fix security vulnerabilities in permission of deleting MMS/SMS
Miao Chou [Mon, 20 Jul 2015 19:14:25 +0000 (12:14 -0700)]
DO NOT MERGE Fix security vulnerabilities in permission of deleting MMS/SMS
This CL adds permission check to avoid unauthorized deletion of any MMS/SMS
messages in BluetoothMapContentObserver.actionMessageSentDisconnected
function.
Bug:
22343270
Change-Id: I30254036309733be4d54db17a8ef17a571cd1c5a
Matthew Xie [Mon, 1 Dec 2014 19:41:57 +0000 (19:41 +0000)]
am
845b549b: am
d9761c69: am
859909c0: am
33cbe675: Check previous user confirmation before auto-confirm put request
* commit '
845b549b22fc861279a3c8fe2d4a83bad6f135d5':
Check previous user confirmation before auto-confirm put request
Matthew Xie [Mon, 1 Dec 2014 19:36:55 +0000 (19:36 +0000)]
am
d9761c69: am
859909c0: am
33cbe675: Check previous user confirmation before auto-confirm put request
* commit '
d9761c692ffbc621460054ad2f034557ad330b7d':
Check previous user confirmation before auto-confirm put request
Matthew Xie [Mon, 1 Dec 2014 19:31:34 +0000 (19:31 +0000)]
am
859909c0: am
33cbe675: Check previous user confirmation before auto-confirm put request
* commit '
859909c048c3477ea47d8dba50f025b8fbf13c90':
Check previous user confirmation before auto-confirm put request
Matthew Xie [Mon, 1 Dec 2014 19:26:52 +0000 (19:26 +0000)]
am
33cbe675: Check previous user confirmation before auto-confirm put request
* commit '
33cbe67533f97c2e819a84ed6b6950bdd7639749':
Check previous user confirmation before auto-confirm put request
Matthew Xie [Mon, 24 Nov 2014 23:26:59 +0000 (23:26 +0000)]
am
d4a6ad3a: am
d981ab06: Check previous user confirmation before auto-confirm put request
* commit '
d4a6ad3a5f5d12ee6901b7a83260267c83dabd76':
Check previous user confirmation before auto-confirm put request
Matthew Xie [Mon, 24 Nov 2014 23:22:02 +0000 (23:22 +0000)]
am
d981ab06: Check previous user confirmation before auto-confirm put request
* commit '
d981ab06c6844ef345cd0a1d3077c4840f978989':
Check previous user confirmation before auto-confirm put request
Matthew Xie [Mon, 17 Nov 2014 17:50:54 +0000 (09:50 -0800)]
Check previous user confirmation before auto-confirm put request
Also correct a confirm status change check in updateShare.
Bug:
17770561,
18343032
Change-Id: I8e7d10e73604c0bf1c88801a1caef7d579fbd1eb
(cherry picked from commit
e93cc4d347fd5d263d7740ad85f7f99b64651126)
Matthew Xie [Mon, 17 Nov 2014 17:50:54 +0000 (09:50 -0800)]
Check previous user confirmation before auto-confirm put request
Also correct a confirm status change check in updateShare.
Bug:
17770561,
18343032
Change-Id: I8e7d10e73604c0bf1c88801a1caef7d579fbd1eb
(cherry picked from commit
e93cc4d347fd5d263d7740ad85f7f99b64651126)
Matthew Xie [Fri, 7 Nov 2014 17:04:49 +0000 (17:04 +0000)]
am
a75e97e7: am
6c32875f: am
b81ccaea: am
964a72ae: updateshare confirm logic missed cases like CONFIRMATION_DENIED, TIMEOUT. fix it
* commit '
a75e97e7e56415d4b4d580cf7c780bcf1659e2af':
updateshare confirm logic missed cases like CONFIRMATION_DENIED, TIMEOUT. fix it
Matthew Xie [Fri, 7 Nov 2014 17:01:18 +0000 (17:01 +0000)]
am
6c32875f: am
b81ccaea: am
964a72ae: updateshare confirm logic missed cases like CONFIRMATION_DENIED, TIMEOUT. fix it
* commit '
6c32875f190e8d04f425ef142416a8f2a535a3df':
updateshare confirm logic missed cases like CONFIRMATION_DENIED, TIMEOUT. fix it
Matthew Xie [Fri, 7 Nov 2014 16:56:15 +0000 (16:56 +0000)]
am
b81ccaea: am
964a72ae: updateshare confirm logic missed cases like CONFIRMATION_DENIED, TIMEOUT. fix it
* commit '
b81ccaea320de5e4fc19d5bc5d81874e9e68ead1':
updateshare confirm logic missed cases like CONFIRMATION_DENIED, TIMEOUT. fix it
Matthew Xie [Fri, 7 Nov 2014 16:52:58 +0000 (16:52 +0000)]
am
964a72ae: updateshare confirm logic missed cases like CONFIRMATION_DENIED, TIMEOUT. fix it
* commit '
964a72ae9eebe882aebcab4b5326afb6cc06f595':
updateshare confirm logic missed cases like CONFIRMATION_DENIED, TIMEOUT. fix it
Matthew Xie [Thu, 23 Oct 2014 19:53:40 +0000 (12:53 -0700)]
updateshare confirm logic missed cases like CONFIRMATION_DENIED, TIMEOUT. fix it
bug
17770561
Change-Id: I34fb018d9787b4deef8592c71f5539778e76e325
(cherry picked from commit
70743aa46fa95bd252acea614bfde8cc65e03890)
Baligh Uddin [Fri, 22 Aug 2014 16:30:17 +0000 (09:30 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8d26c9d88113963727edee77423cfbcd50742ce6
Auto-generated-cl: translation import
Baligh Uddin [Fri, 15 Aug 2014 19:20:32 +0000 (12:20 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3ca5afbffa0ddc43dde3bd614bb8e099550c086a
Auto-generated-cl: translation import
Dmitry Grinberg [Fri, 13 Jun 2014 22:55:34 +0000 (15:55 -0700)]
DO NOT MERGE: Fix concurrency issues with wakelock support
Bluedroid seems to have paths through it that lead us to here in many
ways. Add a lock to prevent confusing ourselves.
Bug:
15532889
Change-Id: Idaa828d9c49fbca5d52bfeeb6e6109df20170e0b
Baligh Uddin [Sun, 6 Jul 2014 19:31:25 +0000 (19:31 +0000)]
am
13ca31dc: (-s ours) am
d18a7b47: (-s ours) Import translations. DO NOT MERGE
* commit '
13ca31dcf258d139fc514ee5b55194495d352b0d':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 19:25:28 +0000 (19:25 +0000)]
am
d18a7b47: (-s ours) Import translations. DO NOT MERGE
* commit '
d18a7b47b99f233f1e381879396c9cfd6395ee4a':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 5 Jul 2014 12:06:45 +0000 (05:06 -0700)]
Import translations. DO NOT MERGE
Change-Id: I58cd4eda734be2858f20e090393cde2721db79da
Auto-generated-cl: translation import
Baligh Uddin [Tue, 1 Jul 2014 17:22:11 +0000 (10:22 -0700)]
Import translations. DO NOT MERGE
Change-Id: I06306963deb2a8a064bbff1662bcb7bdd7fe9d82
Auto-generated-cl: translation import
Baligh Uddin [Wed, 25 Jun 2014 15:53:51 +0000 (08:53 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5e2a582d15a176635680baeef844f2444e4e8f37
Auto-generated-cl: translation import
Baligh Uddin [Thu, 19 Jun 2014 23:36:58 +0000 (16:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id0d736656d17a298ba82aa529907067359b07640
Auto-generated-cl: translation import
Dmitry Grinberg [Thu, 5 Jun 2014 21:05:22 +0000 (14:05 -0700)]
DO NOT MERGE: Give proper package name to wakelock
Bug:
15442409
Change-Id: Ibae4eb97f8607b91f8acb2474704443ad431a6f5
Dmitry Grinberg [Fri, 23 May 2014 21:31:18 +0000 (21:31 +0000)]
Merge "Provide bluedroid with wakelock access as a temporary fix" into klp-modular-dev
Dmitry Grinberg [Wed, 21 May 2014 23:40:50 +0000 (16:40 -0700)]
Provide bluedroid with wakelock access as a temporary fix
Timer subsystem in bluedroid does not handle sleep. Letting it keep
the device awake for its (hopefully) short-lived timers' lives helps.
Change-Id: I0512614314950209484852df4bcfd43c6c47493b
Baligh Uddin [Wed, 21 May 2014 19:56:30 +0000 (12:56 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9394c18a87c01bf5d591f13c244390e61a2bc6f1
Auto-generated-cl: translation import
Matthew Xie [Thu, 1 May 2014 20:59:37 +0000 (13:59 -0700)]
Add Intent.FLAG_RECEIVER_FOREGROUND for pairing intent broadcast
The pairing intents targeting apps for user interaction. The flag
should be used.
bug
13909361
Change-Id: I13f10df46549773bf416f72ca630ea8ee49fe548
Baligh Uddin [Tue, 22 Apr 2014 23:17:54 +0000 (16:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8a359674e94db889d4277025d2d0382afd837bb7
Auto-generated-cl: translation import
Ariel Gertzenstein [Sat, 1 Feb 2014 21:38:45 +0000 (13:38 -0800)]
DO NOT MERGE Update PAN JNI code to match updated interface definition.
This also fixes some weird internal reordering of arguments. All
of the implementations should match the interfaces now.
http://b/
12853951
Change-Id: I019da4892204dd92ebf203e77bdb23af96c57697
Ariel Gertzenstein [Wed, 29 Jan 2014 02:32:06 +0000 (18:32 -0800)]
DO NOT MERGE Avoid race condition that gets PanService stuck in STATE_DISCONNECTED.
http://b/
12788418
Change-Id: I7cc43db047457eb6a4ac501770a714eef0ed6422
zzy [Tue, 4 Mar 2014 00:50:25 +0000 (16:50 -0800)]
DO NOT MERGE: Exit bt process after cleanup
Added code to exit bt process and avoid android process caching.
The fix also gives end user a chance to recover a bad state bt process by
simply turning off/on the bluetooth. Since the process is not recycled,
the kernel frees up all leftover fd and memory and gives bt process a fresh start every time.
Addresses b/
13912278
Change-Id: I616345da70bb60f1aeaab151a6bf6f793168a829
Andre Eisenbach [Tue, 25 Mar 2014 13:32:11 +0000 (06:32 -0700)]
LE: Add API to configure MTU for a given connection (4/4)
bug:
13571470
Change-Id: I4faf13f3daa535337b721a8b48e92334ed0ecb7c
Wei Wang [Thu, 20 Mar 2014 03:36:46 +0000 (03:36 +0000)]
am
e3c4ef80: am
24dce607: DO NOT MERGE: Add status callback for start/stop advertising. cherrypick from master to fix b/
13289050
* commit '
e3c4ef80690ff1389367806fcbafaaf019d0f5ca':
DO NOT MERGE: Add status callback for start/stop advertising. cherrypick from master to fix b/
13289050
Wei Wang [Thu, 20 Mar 2014 03:32:19 +0000 (03:32 +0000)]
am
24dce607: DO NOT MERGE: Add status callback for start/stop advertising. cherrypick from master to fix b/
13289050
* commit '
24dce60783d85fbf49f550203a383b2f4a171a52':
DO NOT MERGE: Add status callback for start/stop advertising. cherrypick from master to fix b/
13289050
Wei Wang [Wed, 12 Mar 2014 05:25:01 +0000 (22:25 -0700)]
DO NOT MERGE: Add status callback for start/stop advertising.
cherrypick from master to fix b/
13289050
Change-Id: I666969442b756ce461ff64eff0d09f5283431fb3
Zhihai Xu [Fri, 14 Mar 2014 15:56:43 +0000 (15:56 +0000)]
am
5bae8a40: am
969f4932: Merge "DO NOT MERGE release wakelock if no activity in Bluetooth MAP profile to avoid waste power." into klp-dev
* commit '
5bae8a40e40e00b84750186309b6f30036c20186':
DO NOT MERGE release wakelock if no activity in Bluetooth MAP profile to avoid waste power.
Zhihai Xu [Wed, 12 Mar 2014 23:10:15 +0000 (23:10 +0000)]
am
969f4932: Merge "DO NOT MERGE release wakelock if no activity in Bluetooth MAP profile to avoid waste power." into klp-dev
* commit '
969f49320925ad968eabf183fd0bbd7d77e7fd5b':
DO NOT MERGE release wakelock if no activity in Bluetooth MAP profile to avoid waste power.
Zhihai Xu [Wed, 12 Mar 2014 23:05:02 +0000 (23:05 +0000)]
Merge "DO NOT MERGE release wakelock if no activity in Bluetooth MAP profile to avoid waste power." into klp-dev
Wei Wang [Tue, 11 Mar 2014 17:43:47 +0000 (17:43 +0000)]
am
4474fd6b: am
b15c6797: Merge "DO NOT MERGE Add Bluetooth privileged permission to bluetooth app. fix b/
13226130." into klp-dev
* commit '
4474fd6bd644cdc0f65d69db92ef203d211eefe5':
DO NOT MERGE Add Bluetooth privileged permission to bluetooth app. fix b/
13226130.
kschulz [Tue, 11 Mar 2014 17:43:33 +0000 (17:43 +0000)]
am
b140b007: am
6d4c5c8b: DO NOT MERGE MAP: fixed missing filtering on Priority
* commit '
b140b007f98f38b1365c26af2472d1ed5b8a46ee':
DO NOT MERGE MAP: fixed missing filtering on Priority
Zhihai Xu [Tue, 11 Mar 2014 17:43:32 +0000 (17:43 +0000)]
am
8872c350: am
d3195daf: DO NOT MERGE update play status based on A2dp audio state from stack.
* commit '
8872c350993db08bf1c58ba39a94087fc2df16b1':
DO NOT MERGE update play status based on A2dp audio state from stack.
Wei Wang [Mon, 10 Mar 2014 17:26:44 +0000 (17:26 +0000)]
am
b15c6797: Merge "DO NOT MERGE Add Bluetooth privileged permission to bluetooth app. fix b/
13226130." into klp-dev
* commit '
b15c6797eeba0a2685cd8375d5e509cfd8bab098':
DO NOT MERGE Add Bluetooth privileged permission to bluetooth app. fix b/
13226130.
Wei Wang [Mon, 10 Mar 2014 17:23:36 +0000 (17:23 +0000)]
Merge "DO NOT MERGE Add Bluetooth privileged permission to bluetooth app. fix b/
13226130." into klp-dev
kschulz [Sun, 9 Mar 2014 19:16:15 +0000 (19:16 +0000)]
am
6d4c5c8b: DO NOT MERGE MAP: fixed missing filtering on Priority
* commit '
6d4c5c8befa3e585271ed4db770dd6990827d1f0':
DO NOT MERGE MAP: fixed missing filtering on Priority
Zhihai Xu [Sun, 9 Mar 2014 19:16:15 +0000 (19:16 +0000)]
am
d3195daf: DO NOT MERGE update play status based on A2dp audio state from stack.
* commit '
d3195daf68329036df6a01331b466844b5cb29de':
DO NOT MERGE update play status based on A2dp audio state from stack.
Zhihai Xu [Wed, 27 Nov 2013 07:09:54 +0000 (23:09 -0800)]
DO NOT MERGE release wakelock if no activity in Bluetooth MAP profile to avoid waste power.
bug:
11138488
Change-Id: Ie7d8903cc917aee51711fa47f275863e4046f3d8
kschulz [Fri, 11 Oct 2013 13:13:25 +0000 (15:13 +0200)]
DO NOT MERGE MAP: fixed missing filtering on Priority
FilterPriority was ignored in the code as SMS does not have priority.
This fixes the support for the priority filter for sms + mms.
NOTICE: sms messages does not have priority and hence will return
an empty messagelisting if the client requests a list with priority
filter set til high-pri only.
Bug:
11168636
Change-Id: If028e47850323d20d1e9a23bc947782ae8da1df0
Zhihai Xu [Wed, 8 Jan 2014 01:34:43 +0000 (17:34 -0800)]
DO NOT MERGE update play status based on A2dp audio state from stack.
this is to work around the problem:some video/audio player didn't
update the play status by calling setPlaybackState.
The headset(HBS730) register the play status update on the phone.
It will depend the play status reported from the phone to send
play or pause command.
bug:
11325212
Change-Id: I7fde5960edd4a5b3474fa17456aacd5b4b432d4d
Wei Wang [Sat, 8 Mar 2014 02:07:31 +0000 (02:07 +0000)]
am
b285350d: (-s ours) am
b9703de9: Merge "DO NOT MERGE BLE peripheral mode (2/4): Gatt Service Change." into klp-dev
* commit '
b285350d6580a118940a0f7d62857a199e362283':
DO NOT MERGE BLE peripheral mode (2/4): Gatt Service Change.
Wei Wang [Sat, 8 Mar 2014 02:02:20 +0000 (02:02 +0000)]
am
b9703de9: Merge "DO NOT MERGE BLE peripheral mode (2/4): Gatt Service Change." into klp-dev
* commit '
b9703de9f4892341e2a1f5ea1908aed19018569f':
DO NOT MERGE BLE peripheral mode (2/4): Gatt Service Change.
Wei Wang [Fri, 28 Feb 2014 22:45:31 +0000 (14:45 -0800)]
DO NOT MERGE Add Bluetooth privileged permission to bluetooth app. fix b/
13226130.
Cherry picking ble advertising changes from master to KLP MR2.
b/
13137996
Change-Id: Iba48f4757a6b54911277900b875d83eaa81488b7
Wei Wang [Sat, 8 Mar 2014 02:00:26 +0000 (02:00 +0000)]
Merge "DO NOT MERGE BLE peripheral mode (2/4): Gatt Service Change." into klp-dev
Mike J. Chen [Fri, 7 Mar 2014 18:47:04 +0000 (18:47 +0000)]
Merge "Add handshake callback support" into klp-modular-dev
Zhihai Xu [Thu, 6 Mar 2014 22:16:14 +0000 (22:16 +0000)]
am
abce10c9: am
e061a83b: Device cannot go to sleep while connected to HBM-570 BT headset
* commit '
abce10c9731e65ca11e6d5a80094bbd1bf1313fa':
Device cannot go to sleep while connected to HBM-570 BT headset
Zhihai Xu [Thu, 6 Mar 2014 21:55:53 +0000 (21:55 +0000)]
am
e061a83b: Device cannot go to sleep while connected to HBM-570 BT headset
* commit '
e061a83b8cbd872cd9f0fea33717aa57112e6228':
Device cannot go to sleep while connected to HBM-570 BT headset
Wei Wang [Wed, 30 Oct 2013 04:20:05 +0000 (21:20 -0700)]
DO NOT MERGE BLE peripheral mode (2/4): Gatt Service Change.
Add advertising data to Gatt Service/
Cherry picking ble advertising changes from master to KLP MR2.
b/
13137996
Change-Id: I0ea7df8c159ad388d8e58768c49e785e9a4694bb
Zhihai Xu [Mon, 14 Oct 2013 19:16:39 +0000 (12:16 -0700)]
Device cannot go to sleep while connected to HBM-570 BT headset
The headset never disconnect the Obex connection for PBAP,
so in this case, we never release the wakelock.
Our PBAP implementation won't release wakelock
until the Obex is disconnected by the remote device
To better control the wake lock, we should
only acquire the wakelock when we receive the reqeust from the remote device
will release the wakelock after we send the response packets.
bug:
10957699
Change-Id: I85e0609e36788d9c36334dd804ec52c90b90615b
Mike J. Chen [Wed, 5 Mar 2014 01:24:54 +0000 (17:24 -0800)]
Add handshake callback support
Change-Id: I7619e6e2ac3589ffa5e0b70e4b28e536c886ce02
Signed-off-by: Mike J. Chen <mjchen@google.com>
Wei Wang [Fri, 28 Feb 2014 22:45:31 +0000 (14:45 -0800)]
Add Bluetooth privileged permission to bluetooth app. fix b/
13226130.
Change-Id: Iba48f4757a6b54911277900b875d83eaa81488b7
Mike J. Chen [Tue, 28 Jan 2014 01:59:07 +0000 (17:59 -0800)]
HID: Hookup get_report_callback and return to Java via broadcast
Change-Id: I5ee7ea72935834ba8a19f7933bb92b8a0a24ba62
Signed-off-by: Mike J. Chen <mjchen@google.com>
Daniel Cashman [Wed, 15 Jan 2014 20:12:58 +0000 (20:12 +0000)]
am
0ba8b42f: am
5d77afc4: am
f0e15e66: am
3f298ffe: am
e9428c35: am
7677468e: am
884362fe: am
ada9e950: am
727741cd: Merge "Use pathPrefix filter instead of path for /btopp content" into jb-mr1-dev
* commit '
0ba8b42fab09bb10031f93bb9d7fc762c310c74f':
Use pathPrefix filter instead of path for /btopp content
Daniel Cashman [Wed, 15 Jan 2014 20:09:25 +0000 (20:09 +0000)]
am
5d77afc4: am
f0e15e66: am
3f298ffe: am
e9428c35: am
7677468e: am
884362fe: am
ada9e950: am
727741cd: Merge "Use pathPrefix filter instead of path for /btopp content" into jb-mr1-dev
* commit '
5d77afc4f37931d05489d64f4f0fdffd7dc13336':
Use pathPrefix filter instead of path for /btopp content
Daniel Cashman [Wed, 15 Jan 2014 20:06:18 +0000 (12:06 -0800)]
am
f0e15e66: am
3f298ffe: am
e9428c35: am
7677468e: am
884362fe: am
ada9e950: am
727741cd: Merge "Use pathPrefix filter instead of path for /btopp content" into jb-mr1-dev
* commit '
f0e15e6669ccfc319cfe943da0697808347951eb':
Use pathPrefix filter instead of path for /btopp content
Daniel Cashman [Wed, 15 Jan 2014 20:03:01 +0000 (12:03 -0800)]
am
3f298ffe: am
e9428c35: am
7677468e: am
884362fe: am
ada9e950: am
727741cd: Merge "Use pathPrefix filter instead of path for /btopp content" into jb-mr1-dev
* commit '
3f298ffe0add6b60e8d6265670928f84ce7d7338':
Use pathPrefix filter instead of path for /btopp content
Daniel Cashman [Wed, 15 Jan 2014 20:00:01 +0000 (12:00 -0800)]
am
e9428c35: am
7677468e: am
884362fe: am
ada9e950: am
727741cd: Merge "Use pathPrefix filter instead of path for /btopp content" into jb-mr1-dev
* commit '
e9428c35344af989f9e643964a81e2dc0ce1ffe1':
Use pathPrefix filter instead of path for /btopp content
Daniel Cashman [Wed, 15 Jan 2014 19:57:08 +0000 (11:57 -0800)]
am
7677468e: am
884362fe: am
ada9e950: am
727741cd: Merge "Use pathPrefix filter instead of path for /btopp content" into jb-mr1-dev
* commit '
7677468ea5a2a71780e8bcf69a97c939b2ebc39b':
Use pathPrefix filter instead of path for /btopp content
Daniel Cashman [Wed, 15 Jan 2014 19:47:54 +0000 (11:47 -0800)]
am
884362fe: am
ada9e950: am
727741cd: Merge "Use pathPrefix filter instead of path for /btopp content" into jb-mr1-dev
* commit '
884362fee9df9f2c61d61bc0926033de82e58f14':
Use pathPrefix filter instead of path for /btopp content
Daniel Cashman [Wed, 15 Jan 2014 19:21:11 +0000 (11:21 -0800)]
am
ada9e950: am
727741cd: Merge "Use pathPrefix filter instead of path for /btopp content" into jb-mr1-dev
* commit '
ada9e95000f65d4ad7e5c697d48c76e6b9e54cf0':
Use pathPrefix filter instead of path for /btopp content
Daniel Cashman [Wed, 15 Jan 2014 19:10:48 +0000 (11:10 -0800)]
am
727741cd: Merge "Use pathPrefix filter instead of path for /btopp content" into jb-mr1-dev
* commit '
727741cd610b35e675e7b7769ddf431e5763344d':
Use pathPrefix filter instead of path for /btopp content
Daniel Cashman [Wed, 15 Jan 2014 19:07:18 +0000 (19:07 +0000)]
Merge "Use pathPrefix filter instead of path for /btopp content" into jb-mr1-dev
Matthew Xie [Mon, 13 Jan 2014 21:17:41 +0000 (21:17 +0000)]
am
750becdf: am
cc3871cd: am
b65d4111: am
6448d8a5: am
2a294154: am
c4d45b2f: am
e6643ed4: am
12533801: am
8e13dea5: am
fdcf4028: am
a162ec5d: am
deb7bdad: Use pathPrefix filter instead of path for /btopp content
* commit '
750becdff590c7400234d36aa3b9056a99776435':
Use pathPrefix filter instead of path for /btopp content
Matthew Xie [Mon, 13 Jan 2014 21:13:57 +0000 (21:13 +0000)]
am
cc3871cd: am
b65d4111: am
6448d8a5: am
2a294154: am
c4d45b2f: am
e6643ed4: am
12533801: am
8e13dea5: am
fdcf4028: am
a162ec5d: am
deb7bdad: Use pathPrefix filter instead of path for /btopp content
* commit '
cc3871cda0fe13cb14a0f83d25134ed04e646dfc':
Use pathPrefix filter instead of path for /btopp content
Matthew Xie [Mon, 13 Jan 2014 21:10:09 +0000 (21:10 +0000)]
am
b65d4111: am
6448d8a5: am
2a294154: am
c4d45b2f: am
e6643ed4: am
12533801: am
8e13dea5: am
fdcf4028: am
a162ec5d: am
deb7bdad: Use pathPrefix filter instead of path for /btopp content
* commit '
b65d4111f2d3fdc0a0e6c852d90e7e7c764e562c':
Use pathPrefix filter instead of path for /btopp content
Matthew Xie [Mon, 13 Jan 2014 21:07:16 +0000 (13:07 -0800)]
am
6448d8a5: am
2a294154: am
c4d45b2f: am
e6643ed4: am
12533801: am
8e13dea5: am
fdcf4028: am
a162ec5d: am
deb7bdad: Use pathPrefix filter instead of path for /btopp content
* commit '
6448d8a59ff9cc765a2d9749683861312d95c3fa':
Use pathPrefix filter instead of path for /btopp content
Matthew Xie [Mon, 13 Jan 2014 21:03:16 +0000 (13:03 -0800)]
am
2a294154: am
c4d45b2f: am
e6643ed4: am
12533801: am
8e13dea5: am
fdcf4028: am
a162ec5d: am
deb7bdad: Use pathPrefix filter instead of path for /btopp content
* commit '
2a2941544f04af1e70f9be8cd6a62de6d545eaae':
Use pathPrefix filter instead of path for /btopp content
Matthew Xie [Mon, 13 Jan 2014 21:00:08 +0000 (13:00 -0800)]
am
c4d45b2f: am
e6643ed4: am
12533801: am
8e13dea5: am
fdcf4028: am
a162ec5d: am
deb7bdad: Use pathPrefix filter instead of path for /btopp content
* commit '
c4d45b2f898d77b61f8614e22645bfb8ecd00930':
Use pathPrefix filter instead of path for /btopp content
Matthew Xie [Mon, 13 Jan 2014 20:57:04 +0000 (12:57 -0800)]
am
e6643ed4: am
12533801: am
8e13dea5: am
fdcf4028: am
a162ec5d: am
deb7bdad: Use pathPrefix filter instead of path for /btopp content
* commit '
e6643ed4cbe6d5ebe4f1a4979a78f81f6aeff1f0':
Use pathPrefix filter instead of path for /btopp content
Matthew Xie [Mon, 13 Jan 2014 20:50:14 +0000 (12:50 -0800)]
am
12533801: am
8e13dea5: am
fdcf4028: am
a162ec5d: am
deb7bdad: Use pathPrefix filter instead of path for /btopp content
* commit '
125338015bd96550c2d15d87a506640499820885':
Use pathPrefix filter instead of path for /btopp content
Matthew Xie [Mon, 13 Jan 2014 20:47:18 +0000 (12:47 -0800)]
am
8e13dea5: am
fdcf4028: am
a162ec5d: am
deb7bdad: Use pathPrefix filter instead of path for /btopp content
* commit '
8e13dea5f919737738db6e38c56cc83f43a7d555':
Use pathPrefix filter instead of path for /btopp content
Matthew Xie [Mon, 13 Jan 2014 20:38:07 +0000 (12:38 -0800)]
am
fdcf4028: am
a162ec5d: am
deb7bdad: Use pathPrefix filter instead of path for /btopp content
* commit '
fdcf402834c3f108a085a9c9b2f3be4848174f3b':
Use pathPrefix filter instead of path for /btopp content
Matthew Xie [Mon, 13 Jan 2014 20:34:58 +0000 (12:34 -0800)]
am
a162ec5d: am
deb7bdad: Use pathPrefix filter instead of path for /btopp content
* commit '
a162ec5d684e4bf3e14ef1ddbd4a910c82915b93':
Use pathPrefix filter instead of path for /btopp content
Matthew Xie [Mon, 13 Jan 2014 19:08:05 +0000 (19:08 +0000)]
am
5830b657: am
baf61647: am
9700464a: am
1e5ea551: am
014f9993: am
bf0aa27e: am
14b74c3c: Use pathPrefix filter instead of path for /btopp content
* commit '
5830b657ebf89ba6e6cf0dcfc48aecc710e49095':
Use pathPrefix filter instead of path for /btopp content
Matthew Xie [Mon, 13 Jan 2014 19:05:30 +0000 (19:05 +0000)]
am
baf61647: am
9700464a: am
1e5ea551: am
014f9993: am
bf0aa27e: am
14b74c3c: Use pathPrefix filter instead of path for /btopp content
* commit '
baf616479161b02e6fe784dc22f2b97ee4e0c4f6':
Use pathPrefix filter instead of path for /btopp content
Matthew Xie [Mon, 13 Jan 2014 19:02:21 +0000 (19:02 +0000)]
am
9700464a: am
1e5ea551: am
014f9993: am
bf0aa27e: am
14b74c3c: Use pathPrefix filter instead of path for /btopp content
* commit '
9700464a2b6fbef825bc278e3ef1cdc6783a0c26':
Use pathPrefix filter instead of path for /btopp content
Daniel Cashman [Mon, 13 Jan 2014 19:00:46 +0000 (19:00 +0000)]
am
c40d6147: am
14ccee08: am
266dce78: am
4fd115eb: am
18c10a10: Merge "Use pathPrefix filter instead of path for /btopp content" into klp-dev
* commit '
c40d614731726adffec2de68df3a5a43ee289b30':
Use pathPrefix filter instead of path for /btopp content
Matthew Xie [Mon, 13 Jan 2014 18:58:46 +0000 (10:58 -0800)]
am
1e5ea551: am
014f9993: am
bf0aa27e: am
14b74c3c: Use pathPrefix filter instead of path for /btopp content
* commit '
1e5ea5518f15533602a589d4c7c55f9e6e7b648b':
Use pathPrefix filter instead of path for /btopp content
Daniel Cashman [Mon, 13 Jan 2014 18:57:04 +0000 (18:57 +0000)]
am
14ccee08: am
266dce78: am
4fd115eb: am
18c10a10: Merge "Use pathPrefix filter instead of path for /btopp content" into klp-dev
* commit '
14ccee08ad0d5d78d91f0c82ec7ba9a550a16065':
Use pathPrefix filter instead of path for /btopp content
Matthew Xie [Mon, 13 Jan 2014 18:56:40 +0000 (10:56 -0800)]
am
014f9993: am
bf0aa27e: am
14b74c3c: Use pathPrefix filter instead of path for /btopp content
* commit '
014f99934e57207df0b68e2c7468b923dc6539d2':
Use pathPrefix filter instead of path for /btopp content
Daniel Cashman [Mon, 13 Jan 2014 18:53:44 +0000 (18:53 +0000)]
am
266dce78: am
4fd115eb: am
18c10a10: Merge "Use pathPrefix filter instead of path for /btopp content" into klp-dev
* commit '
266dce782c074bcb3541f3d43e4b61ab67138370':
Use pathPrefix filter instead of path for /btopp content
Matthew Xie [Mon, 13 Jan 2014 18:53:16 +0000 (10:53 -0800)]
am
bf0aa27e: am
14b74c3c: Use pathPrefix filter instead of path for /btopp content
* commit '
bf0aa27ec7e106deb4fe61a10deebffcfe68b4bd':
Use pathPrefix filter instead of path for /btopp content
Matthew Xie [Mon, 13 Jan 2014 18:50:01 +0000 (10:50 -0800)]
am
14b74c3c: Use pathPrefix filter instead of path for /btopp content
* commit '
14b74c3c20e06cb69b4b624c3ebb9b72bb14090d':
Use pathPrefix filter instead of path for /btopp content
Daniel Cashman [Mon, 13 Jan 2014 18:49:31 +0000 (10:49 -0800)]
am
4fd115eb: am
18c10a10: Merge "Use pathPrefix filter instead of path for /btopp content" into klp-dev
* commit '
4fd115eb21291d301f51aaf6fe260c5e9eecb718':
Use pathPrefix filter instead of path for /btopp content
Daniel Cashman [Mon, 13 Jan 2014 18:46:17 +0000 (10:46 -0800)]
am
18c10a10: Merge "Use pathPrefix filter instead of path for /btopp content" into klp-dev
* commit '
18c10a1061cf300ecdb73139f10b5092de0f3cb7':
Use pathPrefix filter instead of path for /btopp content
Matthew Xie [Mon, 13 Jan 2014 18:45:58 +0000 (10:45 -0800)]
am
deb7bdad: Use pathPrefix filter instead of path for /btopp content
* commit '
deb7bdad8cbe0501d414fdec698387714837f927':
Use pathPrefix filter instead of path for /btopp content