Gitiles
Code Review
Sign In
gerrit-public.fairphone.software
/
platform
/
frameworks
/
base
/
7913cf9da692995578fa91cb3e8c46d8b19ef2ab
7913cf9
am 8a5bb15e: Fix automerge issue
by Adam Lesinski
· 10 years ago
8a5bb15
Fix automerge issue
by Adam Lesinski
· 10 years ago
2bea99c
am b2808c03: Merge "Fix build due to bad merge" into lmp-mr1-dev-plus-aosp
by Adam Lesinski
· 10 years ago
b2808c0
Merge "Fix build due to bad merge" into lmp-mr1-dev-plus-aosp
by Adam Lesinski
· 10 years ago
8f018e3
am 89ff8726: am e2e7e9df: Merge "TIF: Fix a typo and remove an unused method in TvInputService" into lmp-mr1-dev automerge: 085329b
by Dongwon Kang
· 10 years ago
1a14ec0
am 12f6a11d: am 8e264a77: Merge "AudioService: fix cross deadlock" into lmp-mr1-dev automerge: 8befd6f
by Eric Laurent
· 10 years ago
ff348f7
am f2764dd4: am 5880c9c2: am e20e2b9a: am 5a416a49: am a827de4e: Merge "Fixed ADB documentation to work properly on Windows Bug: 17192985" into lmp-docs automerge: 6666f34
by David Friedman
· 10 years ago
f5845fb
am a93dee63: am 9017e061: Merge "Clean up public API of SubInfoRecord." into lmp-mr1-dev automerge: b600d89
by Stuart Scott
· 10 years ago
89ff872
am e2e7e9df: Merge "TIF: Fix a typo and remove an unused method in TvInputService" into lmp-mr1-dev automerge: 085329b
by Dongwon Kang
· 10 years ago
12f6a11
am 8e264a77: Merge "AudioService: fix cross deadlock" into lmp-mr1-dev automerge: 8befd6f
by Eric Laurent
· 10 years ago
f2764dd
am 5880c9c2: am e20e2b9a: am 5a416a49: am a827de4e: Merge "Fixed ADB documentation to work properly on Windows Bug: 17192985" into lmp-docs automerge: 6666f34
by David Friedman
· 10 years ago
a93dee6
am 9017e061: Merge "Clean up public API of SubInfoRecord." into lmp-mr1-dev automerge: b600d89
by Stuart Scott
· 10 years ago
e2e7e9d
Merge "TIF: Fix a typo and remove an unused method in TvInputService" into lmp-mr1-dev
by Dongwon Kang
· 10 years ago
8e264a7
Merge "AudioService: fix cross deadlock" into lmp-mr1-dev automerge: 8befd6f
by Eric Laurent
· 10 years ago
5880c9c
am e20e2b9a: am 5a416a49: am a827de4e: Merge "Fixed ADB documentation to work properly on Windows Bug: 17192985" into lmp-docs
by David Friedman
· 10 years ago
9017e06
Merge "Clean up public API of SubInfoRecord." into lmp-mr1-dev
by Stuart Scott
· 10 years ago
85c6637
am b490d5d3: am 0267541c: am 0a2e42d4: Merge "Fix BridgeContext.get*ResourceValue()" into lmp-dev automerge: 9b64954 automerge: fef5001
by Deepanshu Gupta
· 10 years ago
a2ccfb3
am 9549824d: am 6479282e: am 33996b98: Merge "Support framework menus in ActionBar" into lmp-dev automerge: c23487a automerge: 9a6d8ae
by Deepanshu Gupta
· 10 years ago
0ad1eb3
am 837e65be: am a3698098: am cd5f3bab: Merge "Use the right layout for inflating Action Bar." into lmp-dev automerge: 84a89ed automerge: 5ad0763
by Deepanshu Gupta
· 10 years ago
b490d5d
am 0267541c: am 0a2e42d4: Merge "Fix BridgeContext.get*ResourceValue()" into lmp-dev automerge: 9b64954 automerge: fef5001
by Deepanshu Gupta
· 10 years ago
9549824
am 6479282e: am 33996b98: Merge "Support framework menus in ActionBar" into lmp-dev automerge: c23487a automerge: 9a6d8ae
by Deepanshu Gupta
· 10 years ago
837e65b
am a3698098: am cd5f3bab: Merge "Use the right layout for inflating Action Bar." into lmp-dev automerge: 84a89ed automerge: 5ad0763
by Deepanshu Gupta
· 10 years ago
085329b
Merge "TIF: Fix a typo and remove an unused method in TvInputService" into lmp-mr1-dev
by Dongwon Kang
· 10 years ago
0cc963c
Fix build due to bad merge
by Adam Lesinski
· 10 years ago
c4a0722
am e4ef64da: (-s ours) am dc9dc7fa: (-s ours) am aa816de4: (-s ours) Import translations. DO NOT MERGE automerge: 07dd521 -s ours automerge: ecd9daa -s ours
by Baligh Uddin
· 10 years ago
4741cee
am 4f03fa90: am bff9a23a: am f9503019: Merge "Adn queries for multi-SIM. (2/3)" into lmp-mr1-dev
by Nancy Chen
· 10 years ago
41ca024
am 726715e1: am e6fa3f44: am d1f1ea76: Merge "Few more small meminfo improvements." into lmp-mr1-dev
by Dianne Hackborn
· 10 years ago
c5d81c2
am 1e2a01a6: am 68993a41: am 99a6c1cb: Merge "[Theater Mode] Add framework support for screen double tapping out of theater mode." into lmp-sprout-dev automerge: abf33e4
by Bryce Lee
· 10 years ago
4c148e9
am 52973fa2: am 0b8ae553: am 73e55866: am 550465ba: am e1970f12: Doc change: Tv doc updates for publishing in Google Play. automerge: 45729a1
by Dirk Dougherty
· 10 years ago
cdd11d7
am 4dfff4e7: am 5fa90218: am f7ffcaa7: Merge "Build the split-select tool without C++11 support" into lmp-mr1-dev
by Adam Lesinski
· 10 years ago
e4ef64d
am dc9dc7fa: (-s ours) am aa816de4: (-s ours) Import translations. DO NOT MERGE automerge: 07dd521 -s ours automerge: ecd9daa -s ours
by Baligh Uddin
· 10 years ago
4f03fa9
am bff9a23a: am f9503019: Merge "Adn queries for multi-SIM. (2/3)" into lmp-mr1-dev
by Nancy Chen
· 10 years ago
726715e
am e6fa3f44: am d1f1ea76: Merge "Few more small meminfo improvements." into lmp-mr1-dev
by Dianne Hackborn
· 10 years ago
1e2a01a
am 68993a41: am 99a6c1cb: Merge "[Theater Mode] Add framework support for screen double tapping out of theater mode." into lmp-sprout-dev automerge: abf33e4
by Bryce Lee
· 10 years ago
52973fa
am 0b8ae553: am 73e55866: am 550465ba: am e1970f12: Doc change: Tv doc updates for publishing in Google Play. automerge: 45729a1
by Dirk Dougherty
· 10 years ago
4dfff4e
am 5fa90218: am f7ffcaa7: Merge "Build the split-select tool without C++11 support" into lmp-mr1-dev
by Adam Lesinski
· 10 years ago
24655f3
am 3fd34002: Merge commit \'78be0498\' into manualmerge
by Adam Lesinski
· 10 years ago
3fd3400
Merge commit '78be0498' into manualmerge
by Adam Lesinski
· 10 years ago
8befd6f
Merge "AudioService: fix cross deadlock" into lmp-mr1-dev
by Eric Laurent
· 10 years ago
6666f34
am e20e2b9a: am 5a416a49: am a827de4e: Merge "Fixed ADB documentation to work properly on Windows Bug: 17192985" into lmp-docs
by David Friedman
· 10 years ago
8fa4d6f
AudioService: fix cross deadlock
by Eric Laurent
· 10 years ago
b600d89
Merge "Clean up public API of SubInfoRecord." into lmp-mr1-dev
by Stuart Scott
· 10 years ago
0267541
am 0a2e42d4: Merge "Fix BridgeContext.get*ResourceValue()" into lmp-dev automerge: 9b64954
by Deepanshu Gupta
· 10 years ago
6479282
am 33996b98: Merge "Support framework menus in ActionBar" into lmp-dev automerge: c23487a
by Deepanshu Gupta
· 10 years ago
a369809
am cd5f3bab: Merge "Use the right layout for inflating Action Bar." into lmp-dev automerge: 84a89ed
by Deepanshu Gupta
· 10 years ago
dc9dc7f
am aa816de4: (-s ours) Import translations. DO NOT MERGE automerge: 07dd521 -s ours
by Baligh Uddin
· 10 years ago
ea814d9
am 7fd12db3: Merge "Only hide sensitive content when Keyguard is showing" into lmp-mr1-dev automerge: 3c7efdc automerge: 61059fe
by Jorim Jaggi
· 10 years ago
17ba88e
am 9a4dc72b: am 9b1bad22: am dcea6fa9: am 049db36a: Merge "docs: fixed typo/grammar issues." into klp-modular-docs automerge: aec7c97 automerge: 4182391 automerge: c85ccdf automerge: 343baef
by Luan Nguyen
· 10 years ago
6d26dd5
am b070a7cf: am f05f8a30: am cbabe576: am 0e893eb7: Merge "docs:Added 64-bit image note from Preview page" into klp-modular-docs automerge: 90f734e automerge: 3d76f6a automerge: 583b2cc automerge: efbc7f3
by Joe Fernandez
· 10 years ago
61ce0ac
am f208d803: am 471a354c: am 7d3bd06d: am 1e5bb861: Link and typo fixed automerge: bcf9ced automerge: 9f6ea58 automerge: f978dac automerge: f6ca1a6
by Natalie Masse
· 10 years ago
995ff60
am f9319738: am f6768bac: am c51276ec: am ab64919c: Merge "docs: update reference to FragmentRetainInstance" into klp-modular-docs automerge: a1e3063 automerge: e0da6dd automerge: d584dbe automerge: cca9f67
by Scott Rowe
· 10 years ago
69863ab
am 995c1e0e: am 9586eacf: am 2fb449e9: am 031a0863: am 58c64870: Merge "Typo fixed in sample code" into klp-modular-docs automerge: 2f9ea27 automerge: d6ed575 automerge: a1ce8ca
by Joe Fernandez
· 10 years ago
84f663b
am b507d8de: (-s ours) am eaf585a1: am 80c26ce0: am ee2802eb: Merge "DO NOT MERGE Add empty ArrayList check." into klp-modular-dev automerge: 645e017 -s ours automerge: a8f4b8a -s ours automerge: 9ffa931 -s ours
by Prashant Malani
· 10 years ago
d288f2e
am cd8bff23: am c96d62a6: am b50fd5d5: am 764e61ad: am 8a7ba4c6: Merge "docs: Fixing notify link. Bug: 17571861" into klp-modular-docs automerge: dc1f308 automerge: 884b473 automerge: e3835c1
by Ricardo Cervera
· 10 years ago
3844a49
am 768e068b: am 4e4a1ed3: am 879b948e: am acbfd20d: am 2a364235: Merge "docs: Android Wear Design fixes" into klp-modular-docs automerge: c07a288 automerge: cc8b367 automerge: d3b5483
by Luan Nguyen
· 10 years ago
b1203bf
am cbc3b3db: am c360ec9b: am afa68731: am 841b7a21: am 075531ae: add the butterbar for L announce to Preview landing page automerge: e43bb6a automerge: 870afdb automerge: 5dbac8e
by smain@google.com
· 10 years ago
ebaad4b4
am 6757cc55: am ec3eb1c7: am 6df786d3: am 87c4d66d: am d8d20f52: update analytics event tracking calls to use new script bug: 16331906 automerge: 6fbe299 automerge: 469c8c8 automerge: 21fdc41
by smain@google.com
· 10 years ago
44261ce
am 4a1fb178: am dc489b6c: am 521f964a: am e3e6193e: am 7668aa27: am aa7bcf14: Merge "Revert "docs: Watermarked images for codes that weren\'t found."" into klp-docs automerge: c93723b automerge: 4687757 automerge: 6bda7d2
by Ricardo Cervera-Navarro
· 10 years ago
3a9ffea
am d55f4731: am 4a6b69c5: am ec4bc006: am 4f8a41cc: am a3287768: Merge "docs:SDK tools 23.0.5 Release Note" into klp-modular-docs automerge: 858cfad automerge: d84910b automerge: 6b54651
by Rich Slogar
· 10 years ago
3b6abc6
am 921ceb2e: am f38b98f3: am e9324d0f: am 7ecb0a3e: Merge commit \'a4eb81b\' into klp-modular-dev-plus-aosp automerge: 068cb36 automerge: ee870df
by Eric Gilmore
· 10 years ago
fef5001
am 0a2e42d4: Merge "Fix BridgeContext.get*ResourceValue()" into lmp-dev automerge: 9b64954
by Deepanshu Gupta
· 10 years ago
9a6d8ae
am 33996b98: Merge "Support framework menus in ActionBar" into lmp-dev automerge: c23487a
by Deepanshu Gupta
· 10 years ago
5ad0763
am cd5f3bab: Merge "Use the right layout for inflating Action Bar." into lmp-dev automerge: 84a89ed
by Deepanshu Gupta
· 10 years ago
e20e2b9
am 5a416a49: am a827de4e: Merge "Fixed ADB documentation to work properly on Windows Bug: 17192985" into lmp-docs
by David Friedman
· 10 years ago
bff9a23
am f9503019: Merge "Adn queries for multi-SIM. (2/3)" into lmp-mr1-dev
by Nancy Chen
· 10 years ago
e6fa3f4
am d1f1ea76: Merge "Few more small meminfo improvements." into lmp-mr1-dev
by Dianne Hackborn
· 10 years ago
68993a4
am 99a6c1cb: Merge "[Theater Mode] Add framework support for screen double tapping out of theater mode." into lmp-sprout-dev automerge: abf33e4
by Bryce Lee
· 10 years ago
0b8ae55
am 73e55866: am 550465ba: am e1970f12: Doc change: Tv doc updates for publishing in Google Play. automerge: 45729a1
by Dirk Dougherty
· 10 years ago
5fa9021
am f7ffcaa7: Merge "Build the split-select tool without C++11 support" into lmp-mr1-dev
by Adam Lesinski
· 10 years ago
78be049
am 668f0a35: Merge "Fix issues that will be present in C++11" into lmp-mr1-dev
by Adam Lesinski
· 10 years ago
5a416a4
am a827de4e: Merge "Fixed ADB documentation to work properly on Windows Bug: 17192985" into lmp-docs
by David Friedman
· 10 years ago
ecd9daa
am aa816de4: (-s ours) Import translations. DO NOT MERGE automerge: 07dd521 -s ours
by Baligh Uddin
· 10 years ago
0a2e42d
Merge "Fix BridgeContext.get*ResourceValue()" into lmp-dev automerge: 9b64954
by Deepanshu Gupta
· 10 years ago
f950301
Merge "Adn queries for multi-SIM. (2/3)" into lmp-mr1-dev
by Nancy Chen
· 10 years ago
33996b9
Merge "Support framework menus in ActionBar" into lmp-dev automerge: c23487a
by Deepanshu Gupta
· 10 years ago
cd5f3ba
Merge "Use the right layout for inflating Action Bar." into lmp-dev
by Deepanshu Gupta
· 10 years ago
aa816de
Import translations. DO NOT MERGE automerge: 07dd521 -s ours
by Baligh Uddin
· 10 years ago
d1f1ea7
Merge "Few more small meminfo improvements." into lmp-mr1-dev
by Dianne Hackborn
· 10 years ago
99a6c1c
Merge "[Theater Mode] Add framework support for screen double tapping out of theater mode." into lmp-sprout-dev
by Bryce Lee
· 10 years ago
73e5586
am 550465ba: am e1970f12: Doc change: Tv doc updates for publishing in Google Play.
by Dirk Dougherty
· 10 years ago
a827de4
Merge "Fixed ADB documentation to work properly on Windows Bug: 17192985" into lmp-docs
by David Friedman
· 10 years ago
7fd12db
Merge "Only hide sensitive content when Keyguard is showing" into lmp-mr1-dev automerge: 3c7efdc
by Jorim Jaggi
· 10 years ago
9a4dc72
am 9b1bad22: am dcea6fa9: am 049db36a: Merge "docs: fixed typo/grammar issues." into klp-modular-docs automerge: aec7c97 automerge: 4182391 automerge: c85ccdf
by Luan Nguyen
· 10 years ago
b070a7c
am f05f8a30: am cbabe576: am 0e893eb7: Merge "docs:Added 64-bit image note from Preview page" into klp-modular-docs automerge: 90f734e automerge: 3d76f6a automerge: 583b2cc
by Joe Fernandez
· 10 years ago
f208d80
am 471a354c: am 7d3bd06d: am 1e5bb861: Link and typo fixed automerge: bcf9ced automerge: 9f6ea58 automerge: f978dac
by Natalie Masse
· 10 years ago
f931973
am f6768bac: am c51276ec: am ab64919c: Merge "docs: update reference to FragmentRetainInstance" into klp-modular-docs automerge: a1e3063 automerge: e0da6dd automerge: d584dbe
by Scott Rowe
· 10 years ago
995c1e0
am 9586eacf: am 2fb449e9: am 031a0863: am 58c64870: Merge "Typo fixed in sample code" into klp-modular-docs automerge: 2f9ea27 automerge: d6ed575
by Joe Fernandez
· 10 years ago
b507d8d
am eaf585a1: am 80c26ce0: am ee2802eb: Merge "DO NOT MERGE Add empty ArrayList check." into klp-modular-dev automerge: 645e017 -s ours automerge: a8f4b8a -s ours
by Prashant Malani
· 10 years ago
cd8bff2
am c96d62a6: am b50fd5d5: am 764e61ad: am 8a7ba4c6: Merge "docs: Fixing notify link. Bug: 17571861" into klp-modular-docs automerge: dc1f308 automerge: 884b473
by Ricardo Cervera
· 10 years ago
768e068
am 4e4a1ed3: am 879b948e: am acbfd20d: am 2a364235: Merge "docs: Android Wear Design fixes" into klp-modular-docs automerge: c07a288 automerge: cc8b367
by Luan Nguyen
· 10 years ago
cbc3b3d
am c360ec9b: am afa68731: am 841b7a21: am 075531ae: add the butterbar for L announce to Preview landing page automerge: e43bb6a automerge: 870afdb
by smain@google.com
· 10 years ago
6757cc5
am ec3eb1c7: am 6df786d3: am 87c4d66d: am d8d20f52: update analytics event tracking calls to use new script bug: 16331906 automerge: 6fbe299 automerge: 469c8c8
by smain@google.com
· 10 years ago
4a1fb17
am dc489b6c: am 521f964a: am e3e6193e: am 7668aa27: am aa7bcf14: Merge "Revert "docs: Watermarked images for codes that weren\'t found."" into klp-docs automerge: c93723b automerge: 4687757
by Ricardo Cervera-Navarro
· 10 years ago
d55f473
am 4a6b69c5: am ec4bc006: am 4f8a41cc: am a3287768: Merge "docs:SDK tools 23.0.5 Release Note" into klp-modular-docs automerge: 858cfad automerge: d84910b
by Rich Slogar
· 10 years ago
921ceb2
am f38b98f3: am e9324d0f: am 7ecb0a3e: Merge commit \'a4eb81b\' into klp-modular-dev-plus-aosp automerge: 068cb36
by Eric Gilmore
· 10 years ago
f7ffcaa
Merge "Build the split-select tool without C++11 support" into lmp-mr1-dev
by Adam Lesinski
· 10 years ago
668f0a3
Merge "Fix issues that will be present in C++11" into lmp-mr1-dev
by Adam Lesinski
· 10 years ago
61059fe
Merge "Only hide sensitive content when Keyguard is showing" into lmp-mr1-dev
by Jorim Jaggi
· 10 years ago
c0998b7
am 21c57b29: am d6d0be4f: am 194d2026: am 7d35425b: am a63f81ec: am e15773be: Merge "docs: Android TV publishing requirements" into klp-modular-docs automerge: a9d803e
by Joe Fernandez
· 10 years ago
9b64954
Merge "Fix BridgeContext.get*ResourceValue()" into lmp-dev
by Deepanshu Gupta
· 10 years ago
Next »