Gitiles
Code Review
Sign In
gerrit-public.fairphone.software
/
platform
/
frameworks
/
base
/
5dafb34bca889abb8776a320b1ed9544cff9f9b3
5dafb34
resolved conflicts for merge of e470fd85 to lmp-mr1-ub-dev
by Quddus Chong
· 9 years ago
62eaad7
am f9787d87: Merge "cherrypick from lmp-docs Docs: Correcting how to escape quotes. Original Change-Id: I417546a473f0ebe76a6e4102b87883a85365ac26" into lmp-mr1-ub-docs
by Andrew Solovay
· 9 years ago
f9787d8
Merge "cherrypick from lmp-docs Docs: Correcting how to escape quotes. Original Change-Id: I417546a473f0ebe76a6e4102b87883a85365ac26" into lmp-mr1-ub-docs
by Andrew Solovay
· 9 years ago
9af35e7
am 79918589: docs: Fixed url for Wear sample on \'What\'s New for GMS v7.3\'.
by Quddus Chong
· 9 years ago
a967cad
cherrypick from lmp-docs Docs: Correcting how to escape quotes.
by Andrew Solovay
· 9 years ago
7991858
docs: Fixed url for Wear sample on 'What's New for GMS v7.3'.
by Quddus Chong
· 9 years ago
591ba60
am 26a8090a: cherrypick from lmp-docs docs: Listening for restrictions-changed Original Change-Id: I19c7150a9f36de226d00ad6d8db0e9210d5d135d
by Andrew Solovay
· 9 years ago
26a8090a
cherrypick from lmp-docs docs: Listening for restrictions-changed
by Andrew Solovay
· 9 years ago
1009c8d
am 92ae292e: Merge "docs: Add text to JavaDocs regarding browser file access vulnerability" into lmp-mr1-ub-docs
by Joe Fernandez
· 9 years ago
92ae292e8
Merge "docs: Add text to JavaDocs regarding browser file access vulnerability" into lmp-mr1-ub-docs
by Joe Fernandez
· 9 years ago
66b087d
am d6588e35: am 918b71ca: am a5cca430: am 7a8b0945: am 789c5971: Merge "docs: Added What\'s New section for GMS v7.3 (Parmesan)." into lmp-docs
by Quddus Chong
· 9 years ago
bd4120c
am a5bc07e0: am 8cc54aa3: am 4b76e896: am 1cc56633: am 33ac358a: docs: Add Wear Capability training
by Luan Nguyen
· 9 years ago
e470fd8
am d80f4fc8: am 04002800: am d57ccb8d: am f0936e2f: Merge "docs: Added 3rd-party Javadocs for GMS Parmesan release." into lmp-docs
by Quddus Chong
· 9 years ago
d6588e3
am 918b71ca: am a5cca430: am 7a8b0945: am 789c5971: Merge "docs: Added What\'s New section for GMS v7.3 (Parmesan)." into lmp-docs
by Quddus Chong
· 9 years ago
a5bc07e
am 8cc54aa3: am 4b76e896: am 1cc56633: am 33ac358a: docs: Add Wear Capability training
by Luan Nguyen
· 9 years ago
d80f4fc
am 04002800: am d57ccb8d: am f0936e2f: Merge "docs: Added 3rd-party Javadocs for GMS Parmesan release." into lmp-docs
by Quddus Chong
· 9 years ago
918b71c
am a5cca430: am 7a8b0945: am 789c5971: Merge "docs: Added What\'s New section for GMS v7.3 (Parmesan)." into lmp-docs
by Quddus Chong
· 9 years ago
8cc54aa
am 4b76e896: am 1cc56633: am 33ac358a: docs: Add Wear Capability training
by Luan Nguyen
· 9 years ago
8e3250a
am 674b0648: Merge "docs: support library 22.1 feature updates" into lmp-mr1-ub-docs
by Rich Slogar
· 9 years ago
674b064
Merge "docs: support library 22.1 feature updates" into lmp-mr1-ub-docs
by Rich Slogar
· 9 years ago
22b5ba8
docs: Add text to JavaDocs regarding browser file access vulnerability
by Joe Fernandez
· 9 years ago
0400280
am d57ccb8d: am f0936e2f: Merge "docs: Added 3rd-party Javadocs for GMS Parmesan release." into lmp-docs
by Quddus Chong
· 9 years ago
a5cca43
am 7a8b0945: am 789c5971: Merge "docs: Added What\'s New section for GMS v7.3 (Parmesan)." into lmp-docs
by Quddus Chong
· 9 years ago
f94531c
am 7570ef70: cherrypick from lmp-docs branch. docs: Added What\'s New section for GMS v7.3 (Parmesan). Original change-Id: Ie56171262f866b1f312db5cefaec849353a1c541
by Quddus Chong
· 9 years ago
ef9aeb7
am a93259a4: cherrypick from lmp-docs. docs: Added 3rd-party Javadocs for GMS Parmesan release. Original change-Id: Ia133c7267e500969310524369d34ab07c6aaa854
by Quddus Chong
· 9 years ago
1f5dca0
am 869b428b: am f5fa550a: Merge "Move new script group API into ScriptGroup class"
by Yang Ni
· 9 years ago
d57ccb8
am f0936e2f: Merge "docs: Added 3rd-party Javadocs for GMS Parmesan release." into lmp-docs
by Quddus Chong
· 9 years ago
7a8b094
am 789c5971: Merge "docs: Added What\'s New section for GMS v7.3 (Parmesan)." into lmp-docs
by Quddus Chong
· 9 years ago
7570ef7
cherrypick from lmp-docs branch. docs: Added What's New
by Quddus Chong
· 9 years ago
a93259a
cherrypick from lmp-docs. docs: Added 3rd-party Javadocs for GMS
by Quddus Chong
· 9 years ago
f0936e2
Merge "docs: Added 3rd-party Javadocs for GMS Parmesan release." into lmp-docs
by Quddus Chong
· 9 years ago
789c597
Merge "docs: Added What's New section for GMS v7.3 (Parmesan)." into lmp-docs
by Quddus Chong
· 9 years ago
869b428
am f5fa550a: Merge "Move new script group API into ScriptGroup class"
by Yang Ni
· 9 years ago
f5fa550
Merge "Move new script group API into ScriptGroup class"
by Yang Ni
· 9 years ago
ead1af8
Move new script group API into ScriptGroup class
by Yang Ni
· 9 years ago
a5ee27b
am ee066f57: Merge "cherrypick from lmp-docs docs: Add Wear Capability training Original Change-Id: I52ede5d91936c5eab3d6ee8be8108004cce1f0e0" into lmp-mr1-ub-docs
by Luan Nguyen
· 9 years ago
ee066f5
Merge "cherrypick from lmp-docs docs: Add Wear Capability training Original Change-Id: I52ede5d91936c5eab3d6ee8be8108004cce1f0e0" into lmp-mr1-ub-docs
by Luan Nguyen
· 9 years ago
cfdcf7d
docs: Added What's New section for GMS v7.3 (Parmesan).
by Quddus Chong
· 9 years ago
679934f
am 34997731: cherrypick from lmp-docs docs: Add Channel API summary for Wear. Original Change-Id: I447e58264e142a5e04aaf520d31dc4ced2506ecb
by Luan Nguyen
· 9 years ago
453100c
am 3430f599: am ba43f7e9: Merge "Revert "Sometimes the application context is null""
by Marco Nelissen
· 9 years ago
e85ca7d
docs: support library 22.1 feature updates
by Rich Slogar
· 9 years ago
3430f59
am ba43f7e9: Merge "Revert "Sometimes the application context is null""
by Marco Nelissen
· 9 years ago
ba43f7e
Merge "Revert "Sometimes the application context is null""
by Marco Nelissen
· 9 years ago
360f2ab
Revert "Sometimes the application context is null"
by Marco Nelissen
· 9 years ago
75da217
am 9e05ece7: am 0601a280: Merge "Sometimes the application context is null"
by Marco Nelissen
· 9 years ago
9e05ece
am 0601a280: Merge "Sometimes the application context is null"
by Marco Nelissen
· 9 years ago
0601a28
Merge "Sometimes the application context is null"
by Marco Nelissen
· 9 years ago
a5617d0
am 8408cbe3: cherrypick from lmp-docs docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. Original Change-Id: I0fab71be55f5c3c6d017ba585b92f8493050274a bug: 20304402
by Quddus Chong
· 9 years ago
6ea4f93
am 0ab9655a: (-s ours) Merge "DO NOT MERGE Revert "Load libraries directly from apk"" into lmp-mr1-ub-docs
by Kris Giesing
· 9 years ago
2a0c4a3
am 6cf2d35d: (-s ours) Merge "DO NOT MERGE Revert "Add android.net.IpPrefix#contains()"" into lmp-mr1-ub-docs
by Kris Giesing
· 9 years ago
b3ebc0f
am 663cdc5c: Tweak wording on release notes for Leanback.
by Kris Giesing
· 9 years ago
ac66e2a
am 1c6c22d3: docs: support library 22.1 updates
by Rich Slogar
· 9 years ago
1265197
am 2fb3dc2f: doc: Add Korean version of DAC/distribute/ page.
by Ryosuke Matsuuchi
· 9 years ago
a136b54
am 7e75d3ec: Doc change: distribute landing page.
by Dirk Dougherty
· 9 years ago
c3afa45
am 7ce1ab5f: Merge "docs: studio remove gradle tasks dialog" into lmp-mr1-ub-docs
by Joe Fernandez
· 9 years ago
a2fb6d6
am 6b1b71c9: docs: hierarchyviewer updates
by Rich Slogar
· 9 years ago
5933895
am ba75135a: am 2aa3905c: Merge "DO NOT MERGE: The ValueAnimator\'s state need to be totally reset during clone." into lmp-mr1-modular-dev
by Justin Koh
· 9 years ago
2947926
am 059451e1: am 23606598: DO NOT MERGE: Reset the Node status when clone.
by ztenghui
· 9 years ago
ba75135
am 2aa3905c: Merge "DO NOT MERGE: The ValueAnimator\'s state need to be totally reset during clone." into lmp-mr1-modular-dev
by Justin Koh
· 9 years ago
059451e
am 23606598: DO NOT MERGE: Reset the Node status when clone.
by ztenghui
· 9 years ago
2aa3905
Merge "DO NOT MERGE: The ValueAnimator's state need to be totally reset during clone." into lmp-mr1-modular-dev
by Justin Koh
· 9 years ago
5b0c096
am fb861b6c: am 31fb202e: Merge "Frameworks/base: Compile-time optimize SQLiteConnection"
by Andreas Gampe
· 9 years ago
fb861b6
am 31fb202e: Merge "Frameworks/base: Compile-time optimize SQLiteConnection"
by Andreas Gampe
· 9 years ago
097e1cd
am 765d7c30: am ba6783b6: Merge "Update getExportedPropertyMethods to new reflection API"
by Mathieu Chartier
· 9 years ago
5d3aea2
am c7f9f765: am 189d2785: Merge "Frameworks/base: Fix comment"
by Andreas Gampe
· 9 years ago
31fb202
Merge "Frameworks/base: Compile-time optimize SQLiteConnection"
by Andreas Gampe
· 9 years ago
765d7c3
am ba6783b6: Merge "Update getExportedPropertyMethods to new reflection API"
by Mathieu Chartier
· 9 years ago
c7f9f76
am 189d2785: Merge "Frameworks/base: Fix comment"
by Andreas Gampe
· 9 years ago
ba6783b
Merge "Update getExportedPropertyMethods to new reflection API"
by Mathieu Chartier
· 9 years ago
4f47b40
Frameworks/base: Compile-time optimize SQLiteConnection
by Andreas Gampe
· 9 years ago
4b76e89
am 1cc56633: am 33ac358a: docs: Add Wear Capability training
by Luan Nguyen
· 9 years ago
1cc5663
am 33ac358a: docs: Add Wear Capability training
by Luan Nguyen
· 9 years ago
612e5cd
DO NOT MERGE: The ValueAnimator's state need to be totally reset during clone.
by ztenghui
· 9 years ago
2360659
DO NOT MERGE: Reset the Node status when clone.
by ztenghui
· 9 years ago
836f569
cherrypick from lmp-docs docs: Add Wear Capability training
by Luan Nguyen
· 9 years ago
3499773
cherrypick from lmp-docs docs: Add Channel API summary for Wear.
by Luan Nguyen
· 9 years ago
a8a6516
Update getExportedPropertyMethods to new reflection API
by Mathieu Chartier
· 9 years ago
a120e9f
Merge "Add resources to recyclerview dependency." into lmp-mr1-ub-dev
by Deepanshu Gupta
· 9 years ago
8408cbe
cherrypick from lmp-docs docs: Added 3rd-party Javadocs for Android Support
by Quddus Chong
· 9 years ago
189d278
Merge "Frameworks/base: Fix comment"
by Andreas Gampe
· 9 years ago
8ac2478
am f7be8b67: am fa147b5c: Merge "[ActivityManager] Move UI operation to UI handler"
by Olawale Ogunwale
· 9 years ago
9e6c83a
am acaa886c: am 0408187e: Merge "[ActivityManager] Avoid unnecessary restart provider process"
by Olawale Ogunwale
· 9 years ago
dd8e5fb
Frameworks/base: Fix comment
by Andreas Gampe
· 9 years ago
f7be8b6
am fa147b5c: Merge "[ActivityManager] Move UI operation to UI handler"
by Olawale Ogunwale
· 9 years ago
acaa886
am 0408187e: Merge "[ActivityManager] Avoid unnecessary restart provider process"
by Olawale Ogunwale
· 9 years ago
2da31b1
am 886e8e11: am 2fdd83a9: am d2545775: am 4c20df0b: am 4aebbfbb: Merge "docs: Add Channel API summary for Wear." into lmp-docs
by Luan Nguyen
· 9 years ago
886e8e1
am 2fdd83a9: am d2545775: am 4c20df0b: am 4aebbfbb: Merge "docs: Add Channel API summary for Wear." into lmp-docs
by Luan Nguyen
· 9 years ago
fa147b5
Merge "[ActivityManager] Move UI operation to UI handler"
by Olawale Ogunwale
· 9 years ago
758f714
[ActivityManager] Move UI operation to UI handler
by riddle_hsu
· 9 years ago
da506ff
am 14818725: am 80f99121: Merge "Prevent infinite layout and wallpaper flashing"
by Craig Mautner
· 9 years ago
0408187
Merge "[ActivityManager] Avoid unnecessary restart provider process"
by Olawale Ogunwale
· 9 years ago
d86281c
Sometimes the application context is null
by Marco Nelissen
· 9 years ago
33ac358
docs: Add Wear Capability training
by Luan Nguyen
· 9 years ago
2fdd83a
am d2545775: am 4c20df0b: am 4aebbfbb: Merge "docs: Add Channel API summary for Wear." into lmp-docs
by Luan Nguyen
· 9 years ago
1481872
am 80f99121: Merge "Prevent infinite layout and wallpaper flashing"
by Craig Mautner
· 9 years ago
d254577
am 4c20df0b: am 4aebbfbb: Merge "docs: Add Channel API summary for Wear." into lmp-docs
by Luan Nguyen
· 9 years ago
4c20df0
am 4aebbfbb: Merge "docs: Add Channel API summary for Wear." into lmp-docs
by Luan Nguyen
· 9 years ago
80f9912
Merge "Prevent infinite layout and wallpaper flashing"
by Craig Mautner
· 9 years ago
4aebbfb
Merge "docs: Add Channel API summary for Wear." into lmp-docs
by Luan Nguyen
· 9 years ago
3bbd87d
am 1f4f92ed: am b6feabcf: Merge "Frameworks/base: Use better Class.forName in ZygoteInit"
by Andreas Gampe
· 9 years ago
Next »