Android Build Merger (Role)
|
b1ac97e5c1
|
Merge "Merge "Merge "docs: corrected grammar mistake in Class Overview" into oc-dev am: dc12cb1fb2 am: f125024688" into oc-dr1-dev-plus-aosp am: 3ae1e07073" into oc-mr1-dev-plus-aosp
|
2017-08-11 22:10:37 +00:00 |
|
Cindy Kuang
|
79a1c5d55f
|
Merge "Merge "docs: corrected grammar mistake in Class Overview" into oc-dev am: dc12cb1fb2 am: f125024688" into oc-dr1-dev-plus-aosp
am: 3ae1e07073
Change-Id: Idce519ed971742f869003fd70684615829cbe19b
|
2017-08-11 22:02:22 +00:00 |
|
Winson Chung
|
e1cd325bca
|
Merge "Fixing typo in swipe helper causing views not to be faded when swiped." into oc-mr1-dev
am: 35ebb3c535
Change-Id: I6c37b1732ac7941f5504b1c5d9ac8e13d8715606
|
2017-08-11 22:00:51 +00:00 |
|
Steven Moreland
|
d5593e0f19
|
Merge "ScopedUtfChars: use proper nativehelper headers" am: 75c9e4d594 am: e04a0bf5c7 am: 99cb134bf2 -s ours
am: 7c9f93d832 -s ours
Change-Id: I3b96834e93a0787075902b6464c0b6cbef9d102e
|
2017-08-11 21:48:37 +00:00 |
|
Android Build Merger (Role)
|
3ae1e07073
|
Merge "Merge "docs: corrected grammar mistake in Class Overview" into oc-dev am: dc12cb1fb2 am: f125024688" into oc-dr1-dev-plus-aosp
|
2017-08-11 21:43:59 +00:00 |
|
Cindy Kuang
|
a05e233401
|
Merge "docs: corrected grammar mistake in Class Overview" into oc-dev am: dc12cb1fb2
am: f125024688
Change-Id: I3722fb9dc286ca00da780ba15346ea0a88ea6d3e
|
2017-08-11 21:38:58 +00:00 |
|
Cindy Kuang
|
d7522c5c8c
|
Merge "Merge "docs: replaced "i.e." to fix formatting error" into oc-dev am: 0580ac8a65 am: 07f5257b19" into oc-dr1-dev-plus-aosp
am: 1c634381b1
Change-Id: Ib24f1f55eadcb9076fd81014c2afcab7e173ca4e
|
2017-08-11 21:38:13 +00:00 |
|
Cindy Kuang
|
c5f6633fdc
|
Merge "docs: corrected grammar mistake in Class Overview" into oc-dev am: dc12cb1fb2 am: e4f02db258
am: 51bc4b6c32
Change-Id: I2f04732899a58b64ffb820d62a53a70c1b723f8c
|
2017-08-11 21:33:43 +00:00 |
|
Steven Moreland
|
7c9f93d832
|
Merge "ScopedUtfChars: use proper nativehelper headers" am: 75c9e4d594 am: e04a0bf5c7
am: 99cb134bf2 -s ours
Change-Id: I17668ddde69926f6648d75f2b74f54f234fc5c02
|
2017-08-11 21:33:42 +00:00 |
|
Android Build Merger (Role)
|
1c634381b1
|
Merge "Merge "docs: replaced "i.e." to fix formatting error" into oc-dev am: 0580ac8a65 am: 07f5257b19" into oc-dr1-dev-plus-aosp
|
2017-08-11 21:26:53 +00:00 |
|
Steven Moreland
|
99cb134bf2
|
Merge "ScopedUtfChars: use proper nativehelper headers" am: 75c9e4d594
am: e04a0bf5c7
Change-Id: I3e4e01a5e328ede527ee49d36ac828205994639d
|
2017-08-11 21:24:02 +00:00 |
|
Cindy Kuang
|
520c48609a
|
Merge "docs: replaced "i.e." to fix formatting error" into oc-dev am: 0580ac8a65
am: 07f5257b19
Change-Id: I74c7e7906b4cdcaefc65787ce4d9fcf35a2cecb3
|
2017-08-11 21:22:42 +00:00 |
|
Cindy Kuang
|
51bc4b6c32
|
Merge "docs: corrected grammar mistake in Class Overview" into oc-dev am: dc12cb1fb2
am: e4f02db258
Change-Id: I14c80bbd8838b6af2010463e9d1fb25cf537a167
|
2017-08-11 21:20:11 +00:00 |
|
Cindy Kuang
|
3e85fa11ea
|
Merge "Merge "docs: replaced "i.e." to fix formatting error" into oc-dev am: 0580ac8a65 am: 1e6401b07e" into oc-dr1-dev-plus-aosp
am: a54ab7edf4
Change-Id: I0350cf5af828990539d0fa9ec925feef54348a49
|
2017-08-11 21:16:29 +00:00 |
|
Cindy Kuang
|
f125024688
|
Merge "docs: corrected grammar mistake in Class Overview" into oc-dev
am: dc12cb1fb2
Change-Id: I297557eb072b1fce0395c93c2a770623b5ba1642
|
2017-08-11 21:14:33 +00:00 |
|
Pankaj Kanwar
|
1b7a9c9a49
|
Merge "Catch BadParcelableException in RemoteConnection when setting extras." into oc-dr1-dev am: bcfa22584b
am: b30749b60f
Change-Id: Ie6d0c953dcab31ef98dc68bed1e88e496331f333
|
2017-08-11 21:11:25 +00:00 |
|
Android Build Merger (Role)
|
a54ab7edf4
|
Merge "Merge "docs: replaced "i.e." to fix formatting error" into oc-dev am: 0580ac8a65 am: 1e6401b07e" into oc-dr1-dev-plus-aosp
|
2017-08-11 21:08:13 +00:00 |
|
Steven Moreland
|
e04a0bf5c7
|
Merge "ScopedUtfChars: use proper nativehelper headers"
am: 75c9e4d594
Change-Id: I170b5846981683eacee1081587c7149bab454d91
|
2017-08-11 21:07:06 +00:00 |
|
Cindy Kuang
|
e4f02db258
|
Merge "docs: corrected grammar mistake in Class Overview" into oc-dev
am: dc12cb1fb2
Change-Id: Ida5507009926a936ee247c2f43f44b439351d937
|
2017-08-11 21:06:56 +00:00 |
|
Cindy Kuang
|
07f5257b19
|
Merge "docs: replaced "i.e." to fix formatting error" into oc-dev
am: 0580ac8a65
Change-Id: I094bd99bcaaf51633ac887d38a9323ed5fdc54e2
|
2017-08-11 21:01:15 +00:00 |
|
Pankaj Kanwar
|
b30749b60f
|
Merge "Catch BadParcelableException in RemoteConnection when setting extras." into oc-dr1-dev
am: bcfa22584b
Change-Id: I4cdef151e4a826cee965954352f101c3bdd86d09
|
2017-08-11 21:01:13 +00:00 |
|
Cindy Kuang
|
43adc3d4e3
|
Merge "docs: replaced "i.e." to fix formatting error" into oc-dev am: 0580ac8a65
am: 1e6401b07e
Change-Id: I48f9a5fc207a2c884e51c9091bd19db9bdf15471
|
2017-08-11 21:01:11 +00:00 |
|
Pankaj Kanwar
|
bcfa22584b
|
Merge "Catch BadParcelableException in RemoteConnection when setting extras." into oc-dr1-dev
|
2017-08-11 20:52:52 +00:00 |
|
Todd Kennedy
|
f567dd46da
|
Merge "Save observer in call to commit" into oc-mr1-dev
am: 20c2641ad4
Change-Id: Ie4917755c4936d8afc876aeb60fda4ee225fadb4
|
2017-08-11 20:49:00 +00:00 |
|
Cindy Kuang
|
1e6401b07e
|
Merge "docs: replaced "i.e." to fix formatting error" into oc-dev
am: 0580ac8a65
Change-Id: I7138667ba48fa590c4a7f30cdecf0381c43050a6
|
2017-08-11 20:45:24 +00:00 |
|
Treehugger Robot
|
75c9e4d594
|
Merge "ScopedUtfChars: use proper nativehelper headers"
|
2017-08-11 20:40:35 +00:00 |
|
Cindy Kuang
|
dc12cb1fb2
|
Merge "docs: corrected grammar mistake in Class Overview" into oc-dev
|
2017-08-11 20:38:35 +00:00 |
|
TreeHugger Robot
|
35ebb3c535
|
Merge "Fixing typo in swipe helper causing views not to be faded when swiped." into oc-mr1-dev
|
2017-08-11 20:38:01 +00:00 |
|
Cindy Kuang
|
0580ac8a65
|
Merge "docs: replaced "i.e." to fix formatting error" into oc-dev
|
2017-08-11 20:33:34 +00:00 |
|
TreeHugger Robot
|
20c2641ad4
|
Merge "Save observer in call to commit" into oc-mr1-dev
|
2017-08-11 20:29:03 +00:00 |
|
Android Build Merger (Role)
|
4bb0eb9fb2
|
Merge "Merge "Each package can enqueue one toast at a time." into oc-mr1-dev am: a606d1049f" into oc-mr1-dev-plus-aosp
|
2017-08-11 20:28:43 +00:00 |
|
Beverly
|
bd31429bb8
|
Merge "Each package can enqueue one toast at a time." into oc-mr1-dev
am: a606d1049f
Change-Id: Ib1685574483b83968b4fc14f788d3496a436c096
|
2017-08-11 20:23:51 +00:00 |
|
Steven Moreland
|
7de64d2771
|
Merge "Reference ScopedUtfChar header correctly." into stage-aosp-master am: 3f378940c2 am: 93d8497094
am: 29327cbed9
Change-Id: I93c10835f80d9330c2d7dfd02db97df34005e7b6
|
2017-08-11 20:20:29 +00:00 |
|
TreeHugger Robot
|
a606d1049f
|
Merge "Each package can enqueue one toast at a time." into oc-mr1-dev
|
2017-08-11 20:15:58 +00:00 |
|
Steven Moreland
|
29327cbed9
|
Merge "Reference ScopedUtfChar header correctly." into stage-aosp-master am: 3f378940c2
am: 93d8497094
Change-Id: Ib2a80b747bd1a0c4692a89d17bd96eeb03dbe46e
|
2017-08-11 20:12:31 +00:00 |
|
Steven Moreland
|
93d8497094
|
Merge "Reference ScopedUtfChar header correctly." into stage-aosp-master
am: 3f378940c2
Change-Id: Iecb2b1b6ba647b0fe65c538f0a1cdb957e6dbb3e
|
2017-08-11 20:04:15 +00:00 |
|
Steven Moreland
|
92a7a63d93
|
Merge "Fix android_os_Debug nativehelper headers." into oc-dr1-dev-plus-aosp
am: 8b0e069815
Change-Id: Id8c2004d6e1e4db786244afd1de48d14d21bba57
|
2017-08-11 20:04:15 +00:00 |
|
TreeHugger Robot
|
8b0e069815
|
Merge "Fix android_os_Debug nativehelper headers." into oc-dr1-dev-plus-aosp
|
2017-08-11 19:55:19 +00:00 |
|
TreeHugger Robot
|
3f378940c2
|
Merge "Reference ScopedUtfChar header correctly." into stage-aosp-master
|
2017-08-11 19:53:32 +00:00 |
|
Yin-Chia Yeh
|
df7d855072
|
Merge "Camera: fix legacy device CTS failure" into oc-mr1-dev
am: 0cfad57566
Change-Id: Ifd52c1db5d999dbcaa1855edfda6d60edc384b2a
|
2017-08-11 19:44:50 +00:00 |
|
Beverly
|
b463d29a62
|
Merge "Previous active volume dialog remains above a11y." into oc-mr1-dev
am: 3e4e9e234a
Change-Id: Ibce8d8983efc859d4c37168c900303db49f4e69a
|
2017-08-11 19:40:35 +00:00 |
|
Julia Reynolds
|
4d47f34633
|
Merge "Explicitly allow shell to update listener/assist" into oc-mr1-dev
am: 24a94491e4
Change-Id: Iaefcb277dffd79f0851d759df8afbf3bbc1d14b5
|
2017-08-11 19:28:29 +00:00 |
|
TreeHugger Robot
|
0cfad57566
|
Merge "Camera: fix legacy device CTS failure" into oc-mr1-dev
|
2017-08-11 19:23:11 +00:00 |
|
TreeHugger Robot
|
3e4e9e234a
|
Merge "Previous active volume dialog remains above a11y." into oc-mr1-dev
|
2017-08-11 19:19:10 +00:00 |
|
TreeHugger Robot
|
24a94491e4
|
Merge "Explicitly allow shell to update listener/assist" into oc-mr1-dev
|
2017-08-11 19:16:17 +00:00 |
|
Tyler Gunn
|
c3860b3b52
|
Merge changes from topic 'call-session-may' am: 21e4dbb6ed am: 63769af59d am: 347e5ff103
am: cc1552a2a3
Change-Id: Iac3cd7f26b7a6e7134b9de6b34cdddb2b3e72d4e
|
2017-08-11 19:12:24 +00:00 |
|
Tyler Gunn
|
cc1552a2a3
|
Merge changes from topic 'call-session-may' am: 21e4dbb6ed am: 63769af59d
am: 347e5ff103
Change-Id: I1a53bf75715c4d7d1b2fbd7ebf6dc96c06b78a2f
|
2017-08-11 19:03:20 +00:00 |
|
Tyler Gunn
|
347e5ff103
|
Merge changes from topic 'call-session-may' am: 21e4dbb6ed
am: 63769af59d
Change-Id: I798dc5b56fb8f212153d87e71ac088ba177875b8
|
2017-08-11 18:47:18 +00:00 |
|
Tyler Gunn
|
63769af59d
|
Merge changes from topic 'call-session-may'
am: 21e4dbb6ed
Change-Id: I20a3a9f7808211187da8434a0b1490081a92e8d8
|
2017-08-11 18:33:44 +00:00 |
|
Julia Reynolds
|
abca4907d2
|
Merge "usb string update" into oc-mr1-dev
am: e25757a106
Change-Id: I2c9f9096eeb849191050ed543c7e024ebc088db0
|
2017-08-11 18:33:32 +00:00 |
|