Gitiles
Code Review
Sign In
gerrit-public.fairphone.software
/
platform
/
frameworks
/
base
/
0f422c6d8024fb682d2e30a77ae7cf9c9c456cff
0f422c6
resolved conflicts for merge of 28495b02 into master
by Primiano Tucci
· 10 years ago
73a6489
Fix the "Fix broken merge of "handle bssid blacklist in case of dhcp failures""
by Primiano Tucci
· 10 years ago
5dfe236
am 93116ed9: am 1ec045ad: am 45bdf81a: am e1449dfc: am 32b9f4a6: Merge "Reapply animation duration scale each time it is started." into lmp-dev
by Jeff Brown
· 10 years ago
c414ba1
am e9effbfa: am afcd4961: am 71747669: am 662034f1: am 7f76ff2c: Merge "Suppress redundant power key presses while turning screen on." into lmp-dev
by Jeff Brown
· 10 years ago
aa6814c
am e3b11867: am 7ac3ca42: am a09ae911: am a3d59fa1: am ad658a3d: am bb5a1848: am 8730092a: Merge "docs: Added API highlights for Google Play services 6.1 (Manchego)." into klp-modular-docs
by Quddus Chong
· 10 years ago
7463c2c
am 7435fc6f: am 66c8ce7b: am f3f3f281: am 90a54248: am 2b7b4d07: am bf29d697: am 6628e602: Merge "Updataed Google Play services Javadocs for v6.1 (Manchego) release." into klp-modular-docs
by Quddus Chong
· 10 years ago
896217b
am abbbc594: am ef081faf: am 25221488: am 3edec8ec: am dbcfc8ef: am a18075e8: am bd964cad: docs: Removing references to self note on Common Intents page.
by Ricardo Cervera
· 10 years ago
a2afdaf
am dcc6501c: am 24e579a2: am 614ae244: am d3ffa845: am 692bb81c: am 6d30f576: am 3f7b4d8f: Merge "docs: Update Common Intents page with Google Now actions" into klp-modular-docs
by Ricardo Cervera
· 10 years ago
57d0c93
am 6add5fd4: am 1986ed7a: am 86141f6d: am 3d6b094b: am d76f80bd: Merge "ignore null TaskStack and continue layout for PRIVATE_PRESENTATION window" into lmp-dev
by keunyoung
· 10 years ago
3f3bddf
am 53d56bea: am 4b8e7859: am 43934324: am 224a46e9: am 90f46eca: Merge "Add mProperSigningKeySet to PackageKeySetData constructor." into lmp-dev
by dcashman
· 10 years ago
28495b0
am b75369e2: am 7bbf867b: am 0c0c680d: am a741efd5: Merge "adding debug information to bug report for Bug:16751877" into lmp-dev
by vandwalle
· 10 years ago
93116ed
am 1ec045ad: am 45bdf81a: am e1449dfc: am 32b9f4a6: Merge "Reapply animation duration scale each time it is started." into lmp-dev
by Jeff Brown
· 10 years ago
e9effbf
am afcd4961: am 71747669: am 662034f1: am 7f76ff2c: Merge "Suppress redundant power key presses while turning screen on." into lmp-dev
by Jeff Brown
· 10 years ago
e3b1186
am 7ac3ca42: am a09ae911: am a3d59fa1: am ad658a3d: am bb5a1848: am 8730092a: Merge "docs: Added API highlights for Google Play services 6.1 (Manchego)." into klp-modular-docs
by Quddus Chong
· 10 years ago
7435fc6
am 66c8ce7b: am f3f3f281: am 90a54248: am 2b7b4d07: am bf29d697: am 6628e602: Merge "Updataed Google Play services Javadocs for v6.1 (Manchego) release." into klp-modular-docs
by Quddus Chong
· 10 years ago
abbbc59
am ef081faf: am 25221488: am 3edec8ec: am dbcfc8ef: am a18075e8: am bd964cad: docs: Removing references to self note on Common Intents page.
by Ricardo Cervera
· 10 years ago
dcc6501
am 24e579a2: am 614ae244: am d3ffa845: am 692bb81c: am 6d30f576: am 3f7b4d8f: Merge "docs: Update Common Intents page with Google Now actions" into klp-modular-docs
by Ricardo Cervera
· 10 years ago
6add5fd
am 1986ed7a: am 86141f6d: am 3d6b094b: am d76f80bd: Merge "ignore null TaskStack and continue layout for PRIVATE_PRESENTATION window" into lmp-dev
by keunyoung
· 10 years ago
53d56be
am 4b8e7859: am 43934324: am 224a46e9: am 90f46eca: Merge "Add mProperSigningKeySet to PackageKeySetData constructor." into lmp-dev
by dcashman
· 10 years ago
b75369e
am 7bbf867b: am 0c0c680d: am a741efd5: Merge "adding debug information to bug report for Bug:16751877" into lmp-dev
by vandwalle
· 10 years ago
1ec045a
am 45bdf81a: am e1449dfc: am 32b9f4a6: Merge "Reapply animation duration scale each time it is started." into lmp-dev
by Jeff Brown
· 10 years ago
afcd496
am 71747669: am 662034f1: am 7f76ff2c: Merge "Suppress redundant power key presses while turning screen on." into lmp-dev
by Jeff Brown
· 10 years ago
7ac3ca4
am a09ae911: am a3d59fa1: am ad658a3d: am bb5a1848: am 8730092a: Merge "docs: Added API highlights for Google Play services 6.1 (Manchego)." into klp-modular-docs
by Quddus Chong
· 10 years ago
66c8ce7
am f3f3f281: am 90a54248: am 2b7b4d07: am bf29d697: am 6628e602: Merge "Updataed Google Play services Javadocs for v6.1 (Manchego) release." into klp-modular-docs
by Quddus Chong
· 10 years ago
ef081fa
am 25221488: am 3edec8ec: am dbcfc8ef: am a18075e8: am bd964cad: docs: Removing references to self note on Common Intents page.
by Ricardo Cervera
· 10 years ago
24e579a
am 614ae244: am d3ffa845: am 692bb81c: am 6d30f576: am 3f7b4d8f: Merge "docs: Update Common Intents page with Google Now actions" into klp-modular-docs
by Ricardo Cervera
· 10 years ago
1986ed7a
am 86141f6d: am 3d6b094b: am d76f80bd: Merge "ignore null TaskStack and continue layout for PRIVATE_PRESENTATION window" into lmp-dev
by keunyoung
· 10 years ago
4b8e785
am 43934324: am 224a46e9: am 90f46eca: Merge "Add mProperSigningKeySet to PackageKeySetData constructor." into lmp-dev
by dcashman
· 10 years ago
7bbf867
am 0c0c680d: am a741efd5: Merge "adding debug information to bug report for Bug:16751877" into lmp-dev
by vandwalle
· 10 years ago
45bdf81
am e1449dfc: am 32b9f4a6: Merge "Reapply animation duration scale each time it is started." into lmp-dev
by Jeff Brown
· 10 years ago
7174766
am 662034f1: am 7f76ff2c: Merge "Suppress redundant power key presses while turning screen on." into lmp-dev
by Jeff Brown
· 10 years ago
a09ae91
am a3d59fa1: am ad658a3d: am bb5a1848: am 8730092a: Merge "docs: Added API highlights for Google Play services 6.1 (Manchego)." into klp-modular-docs
by Quddus Chong
· 10 years ago
f3f3f28
am 90a54248: am 2b7b4d07: am bf29d697: am 6628e602: Merge "Updataed Google Play services Javadocs for v6.1 (Manchego) release." into klp-modular-docs
by Quddus Chong
· 10 years ago
2522148
am 3edec8ec: am dbcfc8ef: am a18075e8: am bd964cad: docs: Removing references to self note on Common Intents page.
by Ricardo Cervera
· 10 years ago
614ae24
am d3ffa845: am 692bb81c: am 6d30f576: am 3f7b4d8f: Merge "docs: Update Common Intents page with Google Now actions" into klp-modular-docs
by Ricardo Cervera
· 10 years ago
86141f6
am 3d6b094b: am d76f80bd: Merge "ignore null TaskStack and continue layout for PRIVATE_PRESENTATION window" into lmp-dev
by keunyoung
· 10 years ago
4393432
am 224a46e9: am 90f46eca: Merge "Add mProperSigningKeySet to PackageKeySetData constructor." into lmp-dev
by dcashman
· 10 years ago
0c0c680
am a741efd5: Merge "adding debug information to bug report for Bug:16751877" into lmp-dev
by vandwalle
· 10 years ago
e1449df
am 32b9f4a6: Merge "Reapply animation duration scale each time it is started." into lmp-dev
by Jeff Brown
· 10 years ago
662034f
am 7f76ff2c: Merge "Suppress redundant power key presses while turning screen on." into lmp-dev
by Jeff Brown
· 10 years ago
a3d59fa
am ad658a3d: am bb5a1848: am 8730092a: Merge "docs: Added API highlights for Google Play services 6.1 (Manchego)." into klp-modular-docs
by Quddus Chong
· 10 years ago
90a5424
am 2b7b4d07: am bf29d697: am 6628e602: Merge "Updataed Google Play services Javadocs for v6.1 (Manchego) release." into klp-modular-docs
by Quddus Chong
· 10 years ago
3edec8e
am dbcfc8ef: am a18075e8: am bd964cad: docs: Removing references to self note on Common Intents page.
by Ricardo Cervera
· 10 years ago
d3ffa845
am 692bb81c: am 6d30f576: am 3f7b4d8f: Merge "docs: Update Common Intents page with Google Now actions" into klp-modular-docs
by Ricardo Cervera
· 10 years ago
3d6b094
am d76f80bd: Merge "ignore null TaskStack and continue layout for PRIVATE_PRESENTATION window" into lmp-dev
by keunyoung
· 10 years ago
224a46e
am 90f46eca: Merge "Add mProperSigningKeySet to PackageKeySetData constructor." into lmp-dev
by dcashman
· 10 years ago
a741efd
Merge "adding debug information to bug report for Bug:16751877" into lmp-dev
by vandwalle
· 10 years ago
32b9f4a
Merge "Reapply animation duration scale each time it is started." into lmp-dev
by Jeff Brown
· 10 years ago
7f76ff2
Merge "Suppress redundant power key presses while turning screen on." into lmp-dev
by Jeff Brown
· 10 years ago
ad658a3
am bb5a1848: am 8730092a: Merge "docs: Added API highlights for Google Play services 6.1 (Manchego)." into klp-modular-docs
by Quddus Chong
· 10 years ago
2b7b4d0
am bf29d697: am 6628e602: Merge "Updataed Google Play services Javadocs for v6.1 (Manchego) release." into klp-modular-docs
by Quddus Chong
· 10 years ago
dbcfc8e
am a18075e8: am bd964cad: docs: Removing references to self note on Common Intents page.
by Ricardo Cervera
· 10 years ago
692bb81
am 6d30f576: am 3f7b4d8f: Merge "docs: Update Common Intents page with Google Now actions" into klp-modular-docs
by Ricardo Cervera
· 10 years ago
734ab8e
Suppress redundant power key presses while turning screen on.
by Jeff Brown
· 10 years ago
bb5a184
am 8730092a: Merge "docs: Added API highlights for Google Play services 6.1 (Manchego)." into klp-modular-docs
by Quddus Chong
· 10 years ago
bf29d69
am 6628e602: Merge "Updataed Google Play services Javadocs for v6.1 (Manchego) release." into klp-modular-docs
by Quddus Chong
· 10 years ago
8730092
Merge "docs: Added API highlights for Google Play services 6.1 (Manchego)." into klp-modular-docs
by Quddus Chong
· 10 years ago
6628e60
Merge "Updataed Google Play services Javadocs for v6.1 (Manchego) release." into klp-modular-docs
by Quddus Chong
· 10 years ago
9a0a0ac
am 02737364: am 94f06154: am 6bf67ef1: am c7d477bb: Merge "Keep the BugreportWarningActivity screen on. Make the bugreport warning text scrollable." into lmp-sprout-dev
by Wei Liu
· 10 years ago
0273736
am 94f06154: am 6bf67ef1: am c7d477bb: Merge "Keep the BugreportWarningActivity screen on. Make the bugreport warning text scrollable." into lmp-sprout-dev
by Wei Liu
· 10 years ago
94f0615
am 6bf67ef1: am c7d477bb: Merge "Keep the BugreportWarningActivity screen on. Make the bugreport warning text scrollable." into lmp-sprout-dev
by Wei Liu
· 10 years ago
6bf67ef
am c7d477bb: Merge "Keep the BugreportWarningActivity screen on. Make the bugreport warning text scrollable." into lmp-sprout-dev
by Wei Liu
· 10 years ago
d76f80b
Merge "ignore null TaskStack and continue layout for PRIVATE_PRESENTATION window" into lmp-dev
by keunyoung
· 10 years ago
c7d477b
Merge "Keep the BugreportWarningActivity screen on. Make the bugreport warning text scrollable." into lmp-sprout-dev
by Wei Liu
· 10 years ago
7a08fe0
Reapply animation duration scale each time it is started.
by Jeff Brown
· 10 years ago
d9bc67b
am 0d70c69f: am e0818520: am 40014e1d: Merge "Custom print settings cannot change resolution." into lmp-mr1-dev
by Svet Ganov
· 10 years ago
3250fac
am 13a5ef93: am 061af0e3: am c552800b: Merge "Increase bind remote print spooler timeout for eng builds." into lmp-mr1-dev
by Svet Ganov
· 10 years ago
c0812f4
am 786037ee: am 11735a0b: am 61e6d40b: am 5b5bc109: am 6ec5a256: am 4be6fdeb: am ba2199fa: Merge "docs: Modified the notice in the android.location package file to strongly encourage developers to migrate to the Google Play Services Location API." into klp-modular-doc
by Quddus Chong
· 10 years ago
eda91bf
am f2017fdd: am 50c9c6a3: am b5018434: am d047c0e0: am c2b35efb: am 0e61e44d: am 2a02b881: Merge "docs: Training class for the Wearable UI Library" into klp-modular-docs
by Ricardo Cervera
· 10 years ago
3703699
am f42e1042: am 9e6e4f75: am 1a61bc9c: am 15174523: am d4303161: am 64460a2b: am 83d5c9bf: docs:change required ADT version to 23.0.2
by Rich Slogar
· 10 years ago
d940a0d
am 530c679f: am af3f6e9a: am 456a4e2d: am cb8a81a8: am a2561db3: am 8267ffcc: am cef9aab6: Merge "make sdk download links use HTTPS bug: 8033954" into klp-modular-docs
by smain@google.com
· 10 years ago
0d70c69
am e0818520: am 40014e1d: Merge "Custom print settings cannot change resolution." into lmp-mr1-dev
by Svet Ganov
· 10 years ago
13a5ef9
am 061af0e3: am c552800b: Merge "Increase bind remote print spooler timeout for eng builds." into lmp-mr1-dev
by Svet Ganov
· 10 years ago
786037e
am 11735a0b: am 61e6d40b: am 5b5bc109: am 6ec5a256: am 4be6fdeb: am ba2199fa: Merge "docs: Modified the notice in the android.location package file to strongly encourage developers to migrate to the Google Play Services Location API." into klp-modular-docs
by Quddus Chong
· 10 years ago
f2017fd
am 50c9c6a3: am b5018434: am d047c0e0: am c2b35efb: am 0e61e44d: am 2a02b881: Merge "docs: Training class for the Wearable UI Library" into klp-modular-docs
by Ricardo Cervera
· 10 years ago
f42e104
am 9e6e4f75: am 1a61bc9c: am 15174523: am d4303161: am 64460a2b: am 83d5c9bf: docs:change required ADT version to 23.0.2
by Rich Slogar
· 10 years ago
530c679
am af3f6e9a: am 456a4e2d: am cb8a81a8: am a2561db3: am 8267ffcc: am cef9aab6: Merge "make sdk download links use HTTPS bug: 8033954" into klp-modular-docs
by smain@google.com
· 10 years ago
e081852
am 40014e1d: Merge "Custom print settings cannot change resolution." into lmp-mr1-dev
by Svet Ganov
· 10 years ago
061af0e
am c552800b: Merge "Increase bind remote print spooler timeout for eng builds." into lmp-mr1-dev
by Svet Ganov
· 10 years ago
11735a0
am 61e6d40b: am 5b5bc109: am 6ec5a256: am 4be6fdeb: am ba2199fa: Merge "docs: Modified the notice in the android.location package file to strongly encourage developers to migrate to the Google Play Services Location API." into klp-modular-docs
by Quddus Chong
· 10 years ago
50c9c6a
am b5018434: am d047c0e0: am c2b35efb: am 0e61e44d: am 2a02b881: Merge "docs: Training class for the Wearable UI Library" into klp-modular-docs
by Ricardo Cervera
· 10 years ago
9e6e4f7
am 1a61bc9c: am 15174523: am d4303161: am 64460a2b: am 83d5c9bf: docs:change required ADT version to 23.0.2
by Rich Slogar
· 10 years ago
af3f6e9
am 456a4e2d: am cb8a81a8: am a2561db3: am 8267ffcc: am cef9aab6: Merge "make sdk download links use HTTPS bug: 8033954" into klp-modular-docs
by smain@google.com
· 10 years ago
40014e1
Merge "Custom print settings cannot change resolution." into lmp-mr1-dev
by Svet Ganov
· 10 years ago
c552800
Merge "Increase bind remote print spooler timeout for eng builds." into lmp-mr1-dev
by Svet Ganov
· 10 years ago
f983d08
Increase bind remote print spooler timeout for eng builds.
by Svet Ganov
· 10 years ago
7511603
Keep the BugreportWarningActivity screen on.
by Wei Liu
· 10 years ago
61e6d40
am 5b5bc109: am 6ec5a256: am 4be6fdeb: am ba2199fa: Merge "docs: Modified the notice in the android.location package file to strongly encourage developers to migrate to the Google Play Services Location API." into klp-modular-docs
by Quddus Chong
· 10 years ago
b501843
am d047c0e0: am c2b35efb: am 0e61e44d: am 2a02b881: Merge "docs: Training class for the Wearable UI Library" into klp-modular-docs
by Ricardo Cervera
· 10 years ago
1a61bc9
am 15174523: am d4303161: am 64460a2b: am 83d5c9bf: docs:change required ADT version to 23.0.2
by Rich Slogar
· 10 years ago
456a4e2
am cb8a81a8: am a2561db3: am 8267ffcc: am cef9aab6: Merge "make sdk download links use HTTPS bug: 8033954" into klp-modular-docs
by smain@google.com
· 10 years ago
90f46ec
Merge "Add mProperSigningKeySet to PackageKeySetData constructor." into lmp-dev
by dcashman
· 10 years ago
5b5bc10
am 6ec5a256: am 4be6fdeb: am ba2199fa: Merge "docs: Modified the notice in the android.location package file to strongly encourage developers to migrate to the Google Play Services Location API." into klp-modular-docs
by Quddus Chong
· 10 years ago
d047c0e
am c2b35efb: am 0e61e44d: am 2a02b881: Merge "docs: Training class for the Wearable UI Library" into klp-modular-docs
by Ricardo Cervera
· 10 years ago
1517452
am d4303161: am 64460a2b: am 83d5c9bf: docs:change required ADT version to 23.0.2
by Rich Slogar
· 10 years ago
2eb7fad
Custom print settings cannot change resolution.
by Svet Ganov
· 10 years ago
cb8a81a
am a2561db3: am 8267ffcc: am cef9aab6: Merge "make sdk download links use HTTPS bug: 8033954" into klp-modular-docs
by smain@google.com
· 10 years ago
6ec5a25
am 4be6fdeb: am ba2199fa: Merge "docs: Modified the notice in the android.location package file to strongly encourage developers to migrate to the Google Play Services Location API." into klp-modular-docs
by Quddus Chong
· 10 years ago
c2b35ef
am 0e61e44d: am 2a02b881: Merge "docs: Training class for the Wearable UI Library" into klp-modular-docs
by Ricardo Cervera
· 10 years ago
d430316
am 64460a2b: am 83d5c9bf: docs:change required ADT version to 23.0.2
by Rich Slogar
· 10 years ago
Next »