Gitiles
Code Review
Sign In
gerrit-public.fairphone.software
/
platform
/
frameworks
/
base
/
ead7b78b9eb303115c93f393160a3d91e1e89fab
ead7b78
resolved conflicts for merge of 66189de6 to master
by Joe Fernandez
· 10 years ago
3bf22c3
am 7e5fbc1d: am 8804b2a6: am 4e0575be: am c10acd71: am 9a041f18: am d3c9f2b9: update studio hero image and add section about code editor [CP]
by smain@google.com
· 10 years ago
036a18b
am 85f69e0b: am 6a0e1906: am 8fa02c18: am 08ba05b9: am 6cc5e87d: am 4083327e: docs:build system updates [CP]
by Rich Slogar
· 10 years ago
54e2e63
am 48590173: (-s ours) am 8e29e218: am acd40aa9: am 67fa34e9: am 2d0cf342: am d0c79c4e: fix migrate guide and other studio edits [CP]
by smain@google.com
· 10 years ago
9504b4c
am ae3a1d70: (-s ours) am 8dac5b5e: am fedf3943: am c493dd3f: am e9f63a0f: am 5797e272: docs:sdk installing file update [CP]
by smain@google.com
· 10 years ago
7d7fb8a
am 283a2046: (-s ours) am c5d38e73: am baa56314: am f0eee644: am 521d7277: am 29e13c5a: new Android Studio download page [CP]
by smain@google.com
· 10 years ago
7eb81b7
am b2b89de6: (-s ours) am d0a96b67: am cd13e657: am ca61ce33: am e1136835: am 5d9d7610: docs: publishing with studio [CP]
by Rich Slogar
· 10 years ago
44e9356
am 2153969c: (-s ours) am d1ffd1e3: am 139c7def: am 53513e9e: am 5962474c: am fc64b70a: docs: new Eclipse menu [CP]
by smain@google.com
· 10 years ago
d5fab09
am 3d368a16: (-s ours) am 2e3daaa6: am 6bbb5ed1: am 43304cfc: am 9e6ad10b: am e3fe9382: docs: studio basics v2 [CP]
by Rich Slogar
· 10 years ago
024b355
am a5155276: (-s ours) am e20c9496: am 0b52c5b3: am 88546c85: am 47a19d5d: am fdeb27f9: docs:download updates for studio [CP]
by Rich Slogar
· 10 years ago
da66b8f
am da5184e2: (-s ours) am 7593c6ce: am bcb57c70: am 05d1ba69: am 84f7d62b: am 153c8287: docs:revision updates
by Rich Slogar
· 10 years ago
735c31c
Merge "Add UtteranceProgressListener#onStop callback"
by Przemyslaw Szczepaniak
· 10 years ago
6573fd5
am a565716a: am 14965d0e: am 2abd2dd1: Merge "TIF: TvInputHardwareManager to listen to volume changes" into lmp-mr1-dev
by Wonsik Kim
· 10 years ago
b3f390f
am 83d0c86b: am d14f98fd: am 8638877f: Merge "Support collaborative audio focus handling" into lmp-mr1-dev
by Jean-Michel Trivi
· 10 years ago
404f602
am 458a3b8a: am 1ce435cb: am 13a69707: am 1e51b3ae: am 14864414: am f7f20a45: docs:building your first app [CP]
by Rich Slogar
· 10 years ago
4b73867
Add UtteranceProgressListener#onStop callback
by Przemyslaw Szczepaniak
· 10 years ago
e856fb7
am 6eef2c3a: am 6d3b6ff4: am fe3aabda: am bb642586: am 9fd7804b: am 377604af: docs: project updates [CP]
by smain@google.com
· 10 years ago
9a573a4
am 7e6713fc: am 13b29519: am 382040d4: am 5b2cac58: am f5fa25ec: am 9dd6a07f: docs: setup-virtual-device [CP]
by smain@google.com
· 10 years ago
8e1bd15
am b5c81893: am bc683297: am 70d5341c: am 5b440be7: am d4c89098: am f592a587: docs support library updates [CP]
by Rich Slogar
· 10 years ago
0677368
am cdad9919: am 2bba0c94: am 892577b0: am 86db5b43: am ff88ac5e: am 7a69c2de: docs: debugging studio [CP]
by Rich Slogar
· 10 years ago
650d4df
am 059b6ef3: am 46150b5f: am 51ffc634: am bf96a239: am 5aac6042: am cc4d08b4: docs:setting up hardware devices [CP]
by Rich Slogar
· 10 years ago
acee3b6
am 44176d92: am 5da1430e: am a402fa5f: am f26726b1: am 63d5c3e1: am d16db79e: docs: workflow index [CP]
by Rich Slogar
· 10 years ago
36595d2
am 0622234b: am 359e5597: am d5b6d08e: am 8fbb3f6e: am cf516099: am 5e8d9a02: docs: tools help update [CP]
by Rich Slogar
· 10 years ago
3e885e3
am 46f7dcf1: (-s ours) am 43883b11: am 044a7802: am 4bc2c3bd: am 1efca60b: am e829d8fc: docs: Training refactor for Android Studio [CP]
by Scott Rowe
· 10 years ago
ae13230
Merge "MIDI: API changes to support multiple ports per device"
by Mike Lockwood
· 10 years ago
b6b9a91
MIDI: API changes to support multiple ports per device
by Mike Lockwood
· 10 years ago
7822e64
am 62bb43db: am 122e704a: am 4da55388: Merge "CEC: Avoid setting op in disabled mode" into lmp-mr1-dev
by Jinsuk Kim
· 10 years ago
cf7f964
am 587d349e: am cac94aa0: am 06e922fc: am cf528ec7: am d56f55de: am caacc895: Fixes (updates) download links for NDK r10d.
by David Friedman
· 10 years ago
01b43de
am 5550a408: am 5b8c5dd4: am 699faa1d: Merge "Show "Connected via Wi-Fi assistant" for ephemeral networks." into lmp-mr1-dev
by Jeff Davidson
· 10 years ago
4520f65
am 0efd29fc: am 386effc7: am f779e6b8: Merge "Fix flipped captive portal bit in network conditions bcast." into lmp-mr1-dev
by Jeff Davidson
· 10 years ago
5d0bf5d
am 820ba1f9: am 401ef259: am a4144563: Merge "add disable Ephemeral Network API Bug:18525241" into lmp-mr1-dev
by Jeff Davidson
· 10 years ago
902cc57
am d4753450: am c4b2ec1a: am 1edc73aa: Merge "Don\'t send the same PendingIntent more than once." into lmp-mr1-dev
by Jeremy Joslin
· 10 years ago
d4f3f8b
am 1b001cae: am 068a0786: am 59dac0e1: Merge "Associate a UserHandle with each PhoneAccountHandle" into lmp-mr1-dev
by Evan Charlton
· 10 years ago
64a3ba3
am 446a59bc: am a4afe13a: am 891dd574: Merge "Reap unvalidated networks that have no chance of becoming highest scoring." into lmp-mr1-dev
by Paul Jensen
· 10 years ago
6d4c6db
am f062d8d7: am b15a57d6: am 82cc1c5a: Merge "Unhide secure stop APIs" into lmp-mr1-dev
by Jeff Tinker
· 10 years ago
0de9745
am 5a181a24: am 6fac0351: am b3898fbe: Merge "Talk-back doesn\'t notify user to enter unlock PIN when device is locked with PIN lock. b/18568003" into lmp-mr1-dev
by Jinsong Mu
· 10 years ago
88bf9bc
am 657f25e9: am 2b455544: am 6a1c8256: Merge "Add Text-to-Speech annotations for phone number displays (1/3)" into lmp-mr1-dev
by Ihab Awad
· 10 years ago
5f156f9
am ad9e0d5e: am 7823e6ee: am 968ef51c: am c305e6eb: am 860bdc7d: am b357f74e: Merge "Updates GMSCore docs to reflect ability to selectively include APIs Bug 16679117" into lmp-docs
by David Friedman
· 10 years ago
9053ce8
am b22eea72: am 2d7a1b09: am d386d0f3: Merge "Route mute key events through MediaSessionService" into lmp-mr1-dev
by RoboErik
· 10 years ago
bfa063b
am 0d9d5d0a: am e6000f47: am 52fec470: am f7b51977: am 87644a43: am 2b32a042: Merge "docs: Added API highlights for Google Play service v6.5 (Nacho) release." into lmp-docs
by Quddus Chong
· 10 years ago
754c62a
am a40c6b04: am f428952e: am 9deffecc: am 15c3ce77: am 0dfcfdcb: am 23056929: Merge "docs: Updated Google Play services Javadocs to reflect v6.5 (Nacho) release." into lmp-docs
by Quddus Chong
· 10 years ago
b414f00
am 30b74ccf: am 80d11912: am b503e3f2: Merge "Don\'t destroy surfaces of activities launched behind early." into lmp-mr1-dev
by Wale Ogunwale
· 10 years ago
4bcc9f2
am 73f0e9a3: am 91a5dd9b: am e6a2ff2b: Merge "Fix calculation of overscan insets in WindowState." into lmp-mr1-dev
by Filip Gruszczynski
· 10 years ago
9b07ba1
am 0cfdd810: am e52a2ea0: am 0029f0ac: Merge "Fix issue #17323751: Additional items in aggregated battery stats" into lmp-mr1-dev
by Dianne Hackborn
· 10 years ago
3de2fd4
am 4cb33e76: am 55034822: am 62517a6e: Merge "Fine tune the light radius from 800dp to 600dp" into lmp-mr1-dev
by ztenghui
· 10 years ago
13ead56
am 17c2719d: am 49aeee2e: am 0c1a5bea: Merge "Doing provisioning check for wifi tethering from SystemUI" into lmp-mr1-dev
by Sanket Padawe
· 10 years ago
18f5141
am b71d983a: am 4b905ad4: am 2ff214b6: Merge "Camera2: Add HDR scene mode for backwards compatibility." into lmp-mr1-dev
by Eino-Ville Talvala
· 10 years ago
e50e596
am cfdc0762: am 3e3ae5b7: am 0aaf843c: Merge "Fix docs build" into lmp-mr1-dev
by Eino-Ville Talvala
· 10 years ago
85ca687
am 6b0025ea: am eb29c733: am d2028d90: Merge "Add mapping between RAT and Network Mode" into lmp-mr1-dev
by Stuart Scott
· 10 years ago
a097377
am 8d50d0fb: am 23ad6efb: am df1d07b4: Add checking to find AppDirectedSmsProxy for App Directed SMS feature
by Jing Zhao
· 10 years ago
0d6aacb
am d4ba216a: am ea9abd14: am 0c5ec0e0: Merge "Avoid race condition in heads up snooze code path." into lmp-mr1-dev
by Chris Wren
· 10 years ago
6e69f37
am a2a5d4d0: am 41b0cbb3: am 2aa909f0: Merge "Correctly parse previous PMBA state during backup" into lmp-mr1-dev
by Christopher Tate
· 10 years ago
891663f
am bd2d8202: am a42d95f1: am 8ec2dc00: Merge "Tune delivery and batching of alarms" into lmp-mr1-dev
by Christopher Tate
· 10 years ago
0cec63a
am 913c9895: am d89f0d3d: am b81ce34a: Merge "Revert "Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev"" into lmp-mr1-dev
by Pavel Zhamaitsiak
· 10 years ago
04e8a5f
am e0b2fa5c: am 87797c05: am 4a9cecb1: Merge "Add UUID for Pbap client" into lmp-mr1-dev
by Justin Harrison
· 10 years ago
cbf5984b
am 91fd7728: am 9ae44f92: am 710e20d2: Merge "Relax access on deprecated fields for compatibility." into lmp-mr1-dev
by Ihab Awad
· 10 years ago
864fda2
am b3014b0f: am 9e3adb82: am 4ca9d738: Merge "RTL support for Lollipop Land." into lmp-mr1-dev
by Dan Sandler
· 10 years ago
77779aa
am d483a85e: am fed2812d: am 22afe626: Merge "Added isRemovingAdmin method" into lmp-mr1-dev
by Fyodor Kupolov
· 10 years ago
0d1f8bf
am 333c4a96: am 50734b70: am 43606641: Merge "Correct check of is user running" into lmp-mr1-dev
by Amith Yamasani
· 10 years ago
8b3f47b
am 673f443f: am 695b5d25: am 0752da22: Merge "add system|signature protection to android.permission.BIND_CARRIER_MESSAGING_SERVICE" into lmp-mr1-dev
by Cheuksan Wang
· 10 years ago
f66a43e
am 81b27f4c: am b2905092: am 0702752c: Merge "Potential fix for accidental deactivation of profile owner" into lmp-mr1-dev
by Amith Yamasani
· 10 years ago
6828d32
am 9bb5cef9: am 971fe6d6: am 04c022f4: Merge "AVD: Deep copy the animator target setup when mutate." into lmp-mr1-dev
by ztenghui
· 10 years ago
d0085ea
am 2bfb88ca: am fb569013: am ffbb52d0: am 89d30bbc: am 9c40e80a: am c85fa8f1: Merge "Updating screenshots to LMP release and N6" into lmp-docs
by Clare Bayley
· 10 years ago
e8dc96e
am 0713f944: am e9905bd4: am f58a9091: Merge "Make setting the session token in MediaBrowserService synchronous" into lmp-mr1-dev
by RoboErik
· 10 years ago
36d2b5f
am c92c94a5: am 2f6d30df: am 7792b714: Merge "Don\'t forget to listen for USER_ALL broadcasts." into lmp-mr1-dev
by Dan Sandler
· 10 years ago
9c0e993
am f4a76651: am 5f1ea2e6: am fb967585: Merge "Change the routing path of bluetooth headset connections." into lmp-mr1-dev
by Benjamin Franz
· 10 years ago
18b4204
am 79e346fe: am 66351d62: am cff6d450: Merge "Ensure that the USER_PRESENT_INTENT is sent to all profiles of the current user." into lmp-mr1-dev
by Justin Harrison
· 10 years ago
00c55cf
am 72ebd648: am 1a7bac35: am c8640fca: Merge "Add 8 more scripts to the font fallback chain." into lmp-mr1-dev
by Raph Levien
· 10 years ago
f614ca0
am 6077acaf: am bfc9739b: am 9e094efa: Merge "TIF: handle a race condition when a session is crashed" into lmp-mr1-dev
by Dongwon Kang
· 10 years ago
00274f76
am 46e18c1d: am 91d6f185: am 670de6b6: Merge "TIF: increase the time threshold for tune operation which was too harsh" into lmp-mr1-dev
by Dongwon Kang
· 10 years ago
0b6ccb4
am 5ae61a81: am f5d1cf0b: am 26af8c19: am 26b18771: Merge "Private Window flag to disable touch events in WallpaperService." into lmp-sprout-dev
by Filip Gruszczynski
· 10 years ago
c6b1e5f
am e2c8b5ba: am 2ca0f49d: am 53966f62: am 8242ae16: am dddc2981: am 1782e526: Merge "Revert "docs: Long press to dismiss fix by Wayne"" into lmp-docs
by Ricardo Cervera-Navarro
· 10 years ago
e04cfa8
am 1918d027: am 8aa97d26: am 238efad0: Merge "Change Linkify leniency to VALID" into lmp-mr1-dev
by Raph Levien
· 10 years ago
3f1ef75
am 8940955a: am 859fba1d: am fa53c934: Merge "Use TelecomManager to call TelephonyManager#getVoicemailNumber (1/2)" into lmp-mr1-dev
by Nancy Chen
· 10 years ago
88b0858
am 34e7003a: am 3cb6496b: am 25d2c2d6: Merge "Fix issue #18593636: Turn on "kill important processes that..." into lmp-mr1-dev
by Dianne Hackborn
· 10 years ago
d505fb7
am 5f5e13d0: am 108e5394: am 6dfa60f3: Avoid extra saveLayer calls in RippleDrawable, fix docs
by Alan Viverette
· 10 years ago
f2cc4e9
am f477aeb3: am ed068f7c: am 3a0d878a: Ensure all events from a showing window are dispatched.
by Svetoslav
· 10 years ago
ceabd79
am 967da505: am 2b6dc199: am bcaa315d: Merge "media: allow full range of Vorbis sampling rates" into lmp-mr1-dev
by Lajos Molnar
· 10 years ago
abe3d45
am 3f771d87: am d1133ba8: am 60747974: Merge "CEC: Introduce the retry for commands on the new device discovery." into lmp-mr1-dev
by Jinsuk Kim
· 10 years ago
e68249c
am 7039f6b4: am 7ca6cc75: am 7194bf4d: Merge "Add test for isolated services." into lmp-mr1-dev
by Dianne Hackborn
· 10 years ago
420f4bd
am b7459df4: am 4d1e20a2: am f90b2e5d: Merge "docs: Fix typo, use --> user" into lmp-mr1-dev
by Nick Chalko
· 10 years ago
dda0529
am 0a8cc945: am b29c6299: am 0a77897b: Merge "Fix seeking behavior" into lmp-mr1-dev
by Chet Haase
· 10 years ago
c7a34fc
am 29fb654e: am f6b890e4: am ac76a16d: am ae80fd42: am f5aa6752: am 709df4fa: Merge "docs: Fixes for App Indexing training class" into lmp-docs
by Joe Fernandez
· 10 years ago
2abab3d
am 4d1b8b6c: am 37579034: am fded024a: am 0e597e92: am 9b5de582: am daab7426: Merge "docs: Update MessageAPI notes to mention the unreliable transmission nature." into lmp-docs
by Luan Nguyen
· 10 years ago
f701ff1
am 1bef46b9: am a0ce7116: am 4de95d71: am cc10c02b: am 6c59abc9: am 9db37264: Merge "update L Preview message and disallow crawling /preview" into lmp-docs
by smain@google.com
· 10 years ago
af67d49
am b97782f2: am 4f04cb20: am 8485098f: Merge "Fixed a leak in GeofenceHardwareImpl.java." into lmp-mr1-dev
by Zhentao Sun
· 10 years ago
1a91d8d
resolved conflicts for merge of b9d21d62 to master
by Raph Levien
· 10 years ago
8f51036
Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base
by Jason Monk
· 10 years ago
1bcdba7
am 0538e675: am 85d61aaa: am d601c6c5: Merge "Make CarrierText handle multi-sim" into lmp-mr1-dev
by Jason Monk
· 10 years ago
daf1af3
Merge "Import translations. DO NOT MERGE"
by Geoff Mendal
· 10 years ago
d408f3b
Import translations. DO NOT MERGE
by Geoff Mendal
· 10 years ago
66189de
am d816a983: am c4bac980: am 44e7bcf4: am b6be2bff: am 40c4ccf4: Merge "doc: SDK install page fix and link fixes" into lmp-docs
by Joe Fernandez
· 10 years ago
6310c32
am 42b65c6e: am 4ec024e9: am 71319f28: am 160e7607: am dee9e37e: Merge "add studio 1.0 files and reorder features list" into lmp-docs
by smain@google.com
· 10 years ago
dda0cb9
am 5c09d4b8: am d7f9f30e: am dc842637: am ac3152ee: am 7b9ae53b: doc: fix for SDK installing page
by Joe Fernandez
· 10 years ago
7e5fbc1
am 8804b2a6: am 4e0575be: am c10acd71: am 9a041f18: am d3c9f2b9: update studio hero image and add section about code editor [CP]
by smain@google.com
· 10 years ago
85f69e0
am 6a0e1906: am 8fa02c18: am 08ba05b9: am 6cc5e87d: am 4083327e: docs:build system updates [CP]
by Rich Slogar
· 10 years ago
4859017
am 8e29e218: am acd40aa9: am 67fa34e9: am 2d0cf342: am d0c79c4e: fix migrate guide and other studio edits [CP]
by smain@google.com
· 10 years ago
ae3a1d7
am 8dac5b5e: am fedf3943: am c493dd3f: am e9f63a0f: am 5797e272: docs:sdk installing file update [CP]
by smain@google.com
· 10 years ago
283a204
am c5d38e73: am baa56314: am f0eee644: am 521d7277: am 29e13c5a: new Android Studio download page [CP]
by smain@google.com
· 10 years ago
b2b89de
am d0a96b67: am cd13e657: am ca61ce33: am e1136835: am 5d9d7610: docs: publishing with studio [CP]
by Rich Slogar
· 10 years ago
Next »