OSDN Git Service

android-x86/frameworks-base.git
10 years agoam 0ca0853c: Merge "Update layoutlib create README [DO NOT MERGE]" into klp-modular-dev
Deepanshu Gupta [Tue, 22 Jul 2014 01:03:55 +0000 (01:03 +0000)]
am 0ca0853c: Merge "Update layoutlib create README [DO NOT MERGE]" into klp-modular-dev

* commit '0ca0853c52a81b317996b2997373f5882b369c80':
  Update layoutlib create README [DO NOT MERGE]

10 years agoam d1929c50: am f3659284: Doc change: add reminder for developers on using ad id.
Dirk Dougherty [Tue, 22 Jul 2014 00:58:13 +0000 (00:58 +0000)]
am d1929c50: am f3659284: Doc change: add reminder for developers on using ad id.

* commit 'd1929c505a66afc13d661beac9868f2886cbd1e8':
  Doc change: add reminder for developers on using ad id.

10 years agoam f3659284: Doc change: add reminder for developers on using ad id.
Dirk Dougherty [Tue, 22 Jul 2014 00:54:01 +0000 (00:54 +0000)]
am f3659284: Doc change: add reminder for developers on using ad id.

* commit 'f365928406ef0a80d3aecc2d025642f9efb80a05':
  Doc change: add reminder for developers on using ad id.

10 years agoDoc change: add reminder for developers on using ad id.
Dirk Dougherty [Sun, 22 Jun 2014 20:10:47 +0000 (13:10 -0700)]
Doc change: add reminder for developers on using ad id.

Change-Id: I2a6109bd1b97e4432e36c6a5055aee6e2b1c3edd

10 years agoam 643fa8d1: Merge "docs: Noted how singleTop affects "up" navigation." into klp...
Andrew Solovay [Mon, 21 Jul 2014 17:47:13 +0000 (17:47 +0000)]
am 643fa8d1: Merge "docs: Noted how singleTop affects "up" navigation." into klp-modular-dev

* commit '643fa8d1ecf5d2a485b7b30d43a47d090b5e3dcc':
  docs: Noted how singleTop affects "up" navigation.

10 years agoam d73eb7f9: am 940ae930: Merge "docs: Added note suggesting use of Android Studio...
Ricardo Cervera [Mon, 21 Jul 2014 17:11:42 +0000 (17:11 +0000)]
am d73eb7f9: am 940ae930: Merge "docs: Added note suggesting use of Android Studio over ADT" into klp-modular-docs

* commit 'd73eb7f9c96c2211ab12a09c319978915cf593bf':
  docs: Added note suggesting use of Android Studio over ADT

10 years agoam 940ae930: Merge "docs: Added note suggesting use of Android Studio over ADT" into...
Ricardo Cervera [Mon, 21 Jul 2014 17:07:00 +0000 (17:07 +0000)]
am 940ae930: Merge "docs: Added note suggesting use of Android Studio over ADT" into klp-modular-docs

* commit '940ae93043a7d36d89ab777cbc691893590d326c':
  docs: Added note suggesting use of Android Studio over ADT

10 years agoam efca30d0: am 62c81ab5: docs: change copy for edu video
Robert Ly [Mon, 21 Jul 2014 16:17:39 +0000 (16:17 +0000)]
am efca30d0: am 62c81ab5: docs: change copy for edu video

* commit 'efca30d0fafefb9f59668ee9d918cd7cc6098e6c':
  docs: change copy for edu video

10 years agoam 62c81ab5: docs: change copy for edu video
Robert Ly [Mon, 21 Jul 2014 16:11:39 +0000 (16:11 +0000)]
am 62c81ab5: docs: change copy for edu video

* commit '62c81ab580ec39635fc8b52f552872675c87a816':
  docs: change copy for edu video

10 years agodocs: change copy for edu video
Robert Ly [Mon, 21 Jul 2014 16:06:50 +0000 (09:06 -0700)]
docs: change copy for edu video

Change-Id: I88e5ae8e9c0f899f0e4dfc5087de9ea18153894d

10 years agoMerge "Update layoutlib create README [DO NOT MERGE]" into klp-modular-dev
Deepanshu Gupta [Tue, 22 Jul 2014 00:58:56 +0000 (00:58 +0000)]
Merge "Update layoutlib create README [DO NOT MERGE]" into klp-modular-dev

10 years agoUpdate layoutlib create README [DO NOT MERGE]
Deepanshu Gupta [Tue, 8 Apr 2014 23:16:43 +0000 (16:16 -0700)]
Update layoutlib create README [DO NOT MERGE]

Update the doc to reflect the current state of the tool and use a
consistent 100 char column limit.

Change-Id: I64fb58cc46abbc2f3759cb1f99d42b5090c1409f
(cherry picked from commit 88585f404cb493129847e4487b628062674a4ede)

10 years agoMerge "docs: Added note suggesting use of Android Studio over ADT" into klp-modular...
Ricardo Cervera [Mon, 21 Jul 2014 17:04:09 +0000 (17:04 +0000)]
Merge "docs: Added note suggesting use of Android Studio over ADT" into klp-modular-docs

10 years agodocs: Added note suggesting use of Android Studio over ADT
Ricardo Cervera [Wed, 16 Jul 2014 16:33:39 +0000 (09:33 -0700)]
docs: Added note suggesting use of Android Studio over ADT

Change-Id: Id921c06ea75c70e1ad4741c743f1d15958686b16

10 years agoMerge "docs: Noted how singleTop affects "up" navigation." into klp-modular-dev
Andrew Solovay [Mon, 21 Jul 2014 17:44:26 +0000 (17:44 +0000)]
Merge "docs: Noted how singleTop affects "up" navigation." into klp-modular-dev

10 years agoam 0d5af3f6: am 5d59d371: Merge "Minor typos, consistency things, one grammatical...
David Friedman [Sun, 20 Jul 2014 12:43:19 +0000 (12:43 +0000)]
am 0d5af3f6: am 5d59d371: Merge "Minor typos, consistency things, one grammatical error." into klp-modular-docs

* commit '0d5af3f67bdd3734304a19dad45d995e93b6e957':
  Minor typos, consistency things, one grammatical error.

10 years agoam 5d59d371: Merge "Minor typos, consistency things, one grammatical error." into...
David Friedman [Sun, 20 Jul 2014 07:59:05 +0000 (07:59 +0000)]
am 5d59d371: Merge "Minor typos, consistency things, one grammatical error." into klp-modular-docs

* commit '5d59d371f27008214f29febb0595b602edddcc67':
  Minor typos, consistency things, one grammatical error.

10 years agoam f0804df1: am 349e5760: docs: Fixed bugs in Game Controller training doc. bug:...
Quddus Chong [Fri, 18 Jul 2014 23:08:59 +0000 (23:08 +0000)]
am f0804df1: am 349e5760: docs: Fixed bugs in Game Controller training doc. bug: 1637524714671463

* commit 'f0804df14263bd4f4f3a8bd1f21edd1f741dd8da':
  docs: Fixed bugs in Game Controller training doc. bug: 1637524714671463

10 years agoam 349e5760: docs: Fixed bugs in Game Controller training doc. bug: 16375247, 14671463
Quddus Chong [Fri, 18 Jul 2014 23:04:21 +0000 (23:04 +0000)]
am 349e5760: docs: Fixed bugs in Game Controller training doc. bug: 1637524714671463

* commit '349e5760e701750babdc0f776e51ff2672f7ed2d':
  docs: Fixed bugs in Game Controller training doc. bug: 1637524714671463

10 years agoam f4989910: am d32dd294: am b86675f1: am f2c5a9ee: (-s ours) am b9efa1e5: am 14a4e69...
Deepanshu Gupta [Fri, 18 Jul 2014 22:39:22 +0000 (22:39 +0000)]
am f4989910: am d32dd294: am b86675f1: am f2c5a9ee: (-s ours) am b9efa1e5: am 14a4e69c: am c7351974: (-s ours) am a3966c66: am 62743940: am 8c71ff29: am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]

* commit 'f498991062d86e4cbf1c9880346a7feb8c428912':
  Fix style resolution for styles with '.' [DO NOT MERGE]

10 years agoam d32dd294: am b86675f1: am f2c5a9ee: (-s ours) am b9efa1e5: am 14a4e69c: am c735197...
Deepanshu Gupta [Fri, 18 Jul 2014 22:35:37 +0000 (22:35 +0000)]
am d32dd294: am b86675f1: am f2c5a9ee: (-s ours) am b9efa1e5: am 14a4e69c: am c7351974: (-s ours) am a3966c66: am 62743940: am 8c71ff29: am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]

* commit 'd32dd2948d95a01e6b581ffbc357cf759bae0242':
  Fix style resolution for styles with '.' [DO NOT MERGE]

10 years agoam b86675f1: am f2c5a9ee: (-s ours) am b9efa1e5: am 14a4e69c: am c7351974: (-s ours...
Deepanshu Gupta [Fri, 18 Jul 2014 22:31:17 +0000 (22:31 +0000)]
am b86675f1: am f2c5a9ee: (-s ours) am b9efa1e5: am 14a4e69c: am c7351974: (-s ours) am a3966c66: am 62743940: am 8c71ff29: am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]

* commit 'b86675f14bea0c833f0ac3f0ec4d3e5f46784569':
  Fix style resolution for styles with '.' [DO NOT MERGE]

10 years agoam f2c5a9ee: (-s ours) am b9efa1e5: am 14a4e69c: am c7351974: (-s ours) am a3966c66...
Deepanshu Gupta [Fri, 18 Jul 2014 22:26:45 +0000 (22:26 +0000)]
am f2c5a9ee: (-s ours) am b9efa1e5: am 14a4e69c: am c7351974: (-s ours) am a3966c66: am 62743940: am 8c71ff29: am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]

* commit 'f2c5a9ee4944b5ca995d0c6b11ccaddecf6432e1':
  Fix style resolution for styles with '.' [DO NOT MERGE]

10 years agoam b9efa1e5: am 14a4e69c: am c7351974: (-s ours) am a3966c66: am 62743940: am 8c71ff2...
Deepanshu Gupta [Fri, 18 Jul 2014 22:22:24 +0000 (22:22 +0000)]
am b9efa1e5: am 14a4e69c: am c7351974: (-s ours) am a3966c66: am 62743940: am 8c71ff29: am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]

* commit 'b9efa1e5a11d1542d0bab9c945ce1e920b819764':
  Fix style resolution for styles with '.' [DO NOT MERGE]

10 years agoam ad3ccc74: am 3f51ab0d: am 3c92b932: am 62b81acb: (-s ours) am 2df48bed: am 1bdfead...
Deepanshu Gupta [Fri, 18 Jul 2014 22:17:36 +0000 (22:17 +0000)]
am ad3ccc74: am 3f51ab0d: am 3c92b932: am 62b81acb: (-s ours) am 2df48bed: am 1bdfeadb: am 610341b3: (-s ours) am 95bbeb96: am b8e4e8e1: am d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev

* commit 'ad3ccc741b867c4344e4c6c2338e02052244ae60':
  Fix style resolution for styles with '.' [DO NOT MERGE]

10 years agodocs: Fixed bugs in Game Controller training doc.
Quddus Chong [Fri, 18 Jul 2014 21:38:38 +0000 (14:38 -0700)]
docs: Fixed bugs in Game Controller training doc.
bug: 1637524714671463

Change-Id: I51f595065435c3990a979a66b402acc2b6867a1a

10 years agoam 14a4e69c: am c7351974: (-s ours) am a3966c66: am 62743940: am 8c71ff29: am 87234e8...
Deepanshu Gupta [Fri, 18 Jul 2014 22:17:00 +0000 (22:17 +0000)]
am 14a4e69c: am c7351974: (-s ours) am a3966c66: am 62743940: am 8c71ff29: am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]

* commit '14a4e69cc656b60c705d2f05229aed2a7049693c':
  Fix style resolution for styles with '.' [DO NOT MERGE]

10 years agoam 98b24366: am c35afdfd: am cee55fc1: am 99286edc: (-s ours) am aa0c1c75: am e83fa18...
Deepanshu Gupta [Fri, 18 Jul 2014 22:12:11 +0000 (22:12 +0000)]
am 98b24366: am c35afdfd: am cee55fc1: am 99286edc: (-s ours) am aa0c1c75: am e83fa180: am 696eb4da: (-s ours) am c39916f7: am 37f54f4c: am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE]

* commit '98b243660c56129a0e2962e2faeeef1b65409210':
  Fix default level flags for bidi. [DO NOT MERGE]

10 years agoam 3f51ab0d: am 3c92b932: am 62b81acb: (-s ours) am 2df48bed: am 1bdfeadb: am 610341b...
Deepanshu Gupta [Fri, 18 Jul 2014 22:12:10 +0000 (22:12 +0000)]
am 3f51ab0d: am 3c92b932: am 62b81acb: (-s ours) am 2df48bed: am 1bdfeadb: am 610341b3: (-s ours) am 95bbeb96: am b8e4e8e1: am d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev

* commit '3f51ab0d81b3f24a0246f3bfe28ea5b364b48210':
  Fix style resolution for styles with '.' [DO NOT MERGE]

10 years agoam c7351974: (-s ours) am a3966c66: am 62743940: am 8c71ff29: am 87234e85: am 9c48ab8...
Deepanshu Gupta [Fri, 18 Jul 2014 22:12:02 +0000 (22:12 +0000)]
am c7351974: (-s ours) am a3966c66: am 62743940: am 8c71ff29: am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]

* commit 'c735197420948ffff757dbe6d00028a87ed09c15':
  Fix style resolution for styles with '.' [DO NOT MERGE]

10 years agoam 08840806: am 7f98066d: am 4c312f20: am a3d2c7e7: (-s ours) am 85c7b209: am 5efee91...
Deepanshu Gupta [Fri, 18 Jul 2014 22:07:47 +0000 (22:07 +0000)]
am 08840806: am 7f98066d: am 4c312f20: am a3d2c7e7: (-s ours) am 85c7b209: am 5efee91e: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr2-dev

* commit '08840806b8dbc6c81ec69f409e38ca07f64da528':
  Fix style resolution for styles with '.' [DO NOT MERGE]

10 years agoam a3966c66: am 62743940: am 8c71ff29: am 87234e85: am 9c48ab82: am ccf7b2aa: am...
Deepanshu Gupta [Fri, 18 Jul 2014 22:07:40 +0000 (22:07 +0000)]
am a3966c66: am 62743940: am 8c71ff29: am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]

* commit 'a3966c66ee24109ca4b71f591f0d740ee37987de':
  Fix style resolution for styles with '.' [DO NOT MERGE]

10 years agoam 3c92b932: am 62b81acb: (-s ours) am 2df48bed: am 1bdfeadb: am 610341b3: (-s ours...
Deepanshu Gupta [Fri, 18 Jul 2014 22:07:31 +0000 (22:07 +0000)]
am 3c92b932: am 62b81acb: (-s ours) am 2df48bed: am 1bdfeadb: am 610341b3: (-s ours) am 95bbeb96: am b8e4e8e1: am d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev

* commit '3c92b93226195523ff857763901a33847165ee9e':
  Fix style resolution for styles with '.' [DO NOT MERGE]

10 years agoam c35afdfd: am cee55fc1: am 99286edc: (-s ours) am aa0c1c75: am e83fa180: am 696eb4d...
Deepanshu Gupta [Fri, 18 Jul 2014 22:06:44 +0000 (22:06 +0000)]
am c35afdfd: am cee55fc1: am 99286edc: (-s ours) am aa0c1c75: am e83fa180: am 696eb4da: (-s ours) am c39916f7: am 37f54f4c: am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE]

* commit 'c35afdfd4c40e55e235791341c515bd012d77146':
  Fix default level flags for bidi. [DO NOT MERGE]

10 years agoam 7f98066d: am 4c312f20: am a3d2c7e7: (-s ours) am 85c7b209: am 5efee91e: Merge...
Deepanshu Gupta [Fri, 18 Jul 2014 22:02:28 +0000 (22:02 +0000)]
am 7f98066d: am 4c312f20: am a3d2c7e7: (-s ours) am 85c7b209: am 5efee91e: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr2-dev

* commit '7f98066dd1a2a05d53ba39108dd4d44430e89c71':
  Fix style resolution for styles with '.' [DO NOT MERGE]

10 years agoam 62b81acb: (-s ours) am 2df48bed: am 1bdfeadb: am 610341b3: (-s ours) am 95bbeb96...
Deepanshu Gupta [Fri, 18 Jul 2014 22:02:14 +0000 (22:02 +0000)]
am 62b81acb: (-s ours) am 2df48bed: am 1bdfeadb: am 610341b3: (-s ours) am 95bbeb96: am b8e4e8e1: am d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev

* commit '62b81acbcad6ceaa269c7f788068bdf32f403040':
  Fix style resolution for styles with '.' [DO NOT MERGE]

10 years agoam cee55fc1: am 99286edc: (-s ours) am aa0c1c75: am e83fa180: am 696eb4da: (-s ours...
Deepanshu Gupta [Fri, 18 Jul 2014 22:02:07 +0000 (22:02 +0000)]
am cee55fc1: am 99286edc: (-s ours) am aa0c1c75: am e83fa180: am 696eb4da: (-s ours) am c39916f7: am 37f54f4c: am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE]

* commit 'cee55fc19bc9542d17081568ba082b56b5e5d04d':
  Fix default level flags for bidi. [DO NOT MERGE]

10 years agoam 62743940: am 8c71ff29: am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix...
Deepanshu Gupta [Fri, 18 Jul 2014 22:01:45 +0000 (22:01 +0000)]
am 62743940: am 8c71ff29: am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]

* commit '627439401ec86a083eefdc61728d6aa75ce9a4e5':
  Fix style resolution for styles with '.' [DO NOT MERGE]

10 years agoam 8613f826: am efd29681: am 964591a6: am c3a7763b: (-s ours) am 918ca12f: am 10395cb...
Deepanshu Gupta [Fri, 18 Jul 2014 22:00:01 +0000 (22:00 +0000)]
am 8613f826: am efd29681: am 964591a6: am c3a7763b: (-s ours) am 918ca12f: am 10395cbb: Fix default level flags for bidi. [DO NOT MERGE]

* commit '8613f826289d627df07971f074a2852012fc98b7':
  Fix default level flags for bidi. [DO NOT MERGE]

10 years agoam 8c71ff29: am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution...
Deepanshu Gupta [Fri, 18 Jul 2014 21:58:42 +0000 (21:58 +0000)]
am 8c71ff29: am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]

* commit '8c71ff298b10ebdd3e5dec6f69f70176161b7e0a':
  Fix style resolution for styles with '.' [DO NOT MERGE]

10 years agoam 4c312f20: am a3d2c7e7: (-s ours) am 85c7b209: am 5efee91e: Merge "Fix style resolu...
Deepanshu Gupta [Fri, 18 Jul 2014 21:57:44 +0000 (21:57 +0000)]
am 4c312f20: am a3d2c7e7: (-s ours) am 85c7b209: am 5efee91e: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr2-dev

* commit '4c312f20cafc3160e04224f18cacd8d35a7f9e3c':
  Fix style resolution for styles with '.' [DO NOT MERGE]

10 years agoam 2df48bed: am 1bdfeadb: am 610341b3: (-s ours) am 95bbeb96: am b8e4e8e1: am d3ac01f...
Deepanshu Gupta [Fri, 18 Jul 2014 21:57:16 +0000 (21:57 +0000)]
am 2df48bed: am 1bdfeadb: am 610341b3: (-s ours) am 95bbeb96: am b8e4e8e1: am d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev

* commit '2df48bed6afed4958835b8bdc2c8b44db32919fc':
  Fix style resolution for styles with '.' [DO NOT MERGE]

10 years agoam 99286edc: (-s ours) am aa0c1c75: am e83fa180: am 696eb4da: (-s ours) am c39916f7...
Deepanshu Gupta [Fri, 18 Jul 2014 21:57:01 +0000 (21:57 +0000)]
am 99286edc: (-s ours) am aa0c1c75: am e83fa180: am 696eb4da: (-s ours) am c39916f7: am 37f54f4c: am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE]

* commit '99286edc3ef164d0d247a86cc58c391e5854aa70':
  Fix default level flags for bidi. [DO NOT MERGE]

10 years agoam 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles...
Deepanshu Gupta [Fri, 18 Jul 2014 21:55:21 +0000 (21:55 +0000)]
am 87234e85: am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]

* commit '87234e8544370d86b305fc55d6a5021c38b65495':
  Fix style resolution for styles with '.' [DO NOT MERGE]

10 years agoam efd29681: am 964591a6: am c3a7763b: (-s ours) am 918ca12f: am 10395cbb: Fix defaul...
Deepanshu Gupta [Fri, 18 Jul 2014 21:54:59 +0000 (21:54 +0000)]
am efd29681: am 964591a6: am c3a7763b: (-s ours) am 918ca12f: am 10395cbb: Fix default level flags for bidi. [DO NOT MERGE]

* commit 'efd29681d8f8df6d23a1e7f307e9300bd8331a2f':
  Fix default level flags for bidi. [DO NOT MERGE]

10 years agoam a9e488a6: am d8d3e87c: am 4627c98d: Merge "Fix style resolution for styles with...
Deepanshu Gupta [Fri, 18 Jul 2014 21:53:37 +0000 (21:53 +0000)]
am a9e488a6: am d8d3e87c: am 4627c98d: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into klp-dev

* commit 'a9e488a6d2b20ecc91412072a5f39022d7fe6926':
  Fix style resolution for styles with '.' [DO NOT MERGE]

10 years agoam aa0c1c75: am e83fa180: am 696eb4da: (-s ours) am c39916f7: am 37f54f4c: am 357ebfc...
Deepanshu Gupta [Fri, 18 Jul 2014 21:53:15 +0000 (21:53 +0000)]
am aa0c1c75: am e83fa180: am 696eb4da: (-s ours) am c39916f7: am 37f54f4c: am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE]

* commit 'aa0c1c755c15fec30f005d53bed6091180c4e521':
  Fix default level flags for bidi. [DO NOT MERGE]

10 years agoam 1bdfeadb: am 610341b3: (-s ours) am 95bbeb96: am b8e4e8e1: am d3ac01ff: Merge...
Deepanshu Gupta [Fri, 18 Jul 2014 21:53:11 +0000 (21:53 +0000)]
am 1bdfeadb: am 610341b3: (-s ours) am 95bbeb96: am b8e4e8e1: am d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev

* commit '1bdfeadb61343a5331fcfda06b40a0e3042a2ae6':
  Fix style resolution for styles with '.' [DO NOT MERGE]

10 years agoam a3d2c7e7: (-s ours) am 85c7b209: am 5efee91e: Merge "Fix style resolution for...
Deepanshu Gupta [Fri, 18 Jul 2014 21:52:52 +0000 (21:52 +0000)]
am a3d2c7e7: (-s ours) am 85c7b209: am 5efee91e: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr2-dev

* commit 'a3d2c7e72b1580ebeffe7b4deaa46103d3d66fa7':
  Fix style resolution for styles with '.' [DO NOT MERGE]

10 years agoam 964591a6: am c3a7763b: (-s ours) am 918ca12f: am 10395cbb: Fix default level flags...
Deepanshu Gupta [Fri, 18 Jul 2014 21:50:15 +0000 (21:50 +0000)]
am 964591a6: am c3a7763b: (-s ours) am 918ca12f: am 10395cbb: Fix default level flags for bidi. [DO NOT MERGE]

* commit '964591a6e1be2d19dcd00229aa5ed50acd4847e6':
  Fix default level flags for bidi. [DO NOT MERGE]

10 years agoam 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\...
Deepanshu Gupta [Fri, 18 Jul 2014 21:50:15 +0000 (21:50 +0000)]
am 9c48ab82: am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]

* commit '9c48ab82084828087c47086f2379b4927ec057e2':
  Fix style resolution for styles with '.' [DO NOT MERGE]

10 years agoam e83fa180: am 696eb4da: (-s ours) am c39916f7: am 37f54f4c: am 357ebfc5: Fix defaul...
Deepanshu Gupta [Fri, 18 Jul 2014 21:49:13 +0000 (21:49 +0000)]
am e83fa180: am 696eb4da: (-s ours) am c39916f7: am 37f54f4c: am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE]

* commit 'e83fa180a874fb9222ae8e87c0d333411decc0c7':
  Fix default level flags for bidi. [DO NOT MERGE]

10 years agoam 610341b3: (-s ours) am 95bbeb96: am b8e4e8e1: am d3ac01ff: Merge "Fix style resolu...
Deepanshu Gupta [Fri, 18 Jul 2014 21:49:11 +0000 (21:49 +0000)]
am 610341b3: (-s ours) am 95bbeb96: am b8e4e8e1: am d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev

* commit '610341b3eb99ef2f070c96d60ca30c28283f1dea':
  Fix style resolution for styles with '.' [DO NOT MERGE]

10 years agoam d8d3e87c: am 4627c98d: Merge "Fix style resolution for styles with \'.\' [DO NOT...
Deepanshu Gupta [Fri, 18 Jul 2014 21:48:05 +0000 (21:48 +0000)]
am d8d3e87c: am 4627c98d: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into klp-dev

* commit 'd8d3e87cf339deaf890e4b083d09b074065cd35f':
  Fix style resolution for styles with '.' [DO NOT MERGE]

10 years agoam f75489f2: am c425c438: am 710a55b4: Fix default level flags for bidi. [DO NOT...
Deepanshu Gupta [Fri, 18 Jul 2014 21:45:47 +0000 (21:45 +0000)]
am f75489f2: am c425c438: am 710a55b4: Fix default level flags for bidi. [DO NOT MERGE]

* commit 'f75489f2f1f2dc4f75205f4b242800777bf7d5ec':
  Fix default level flags for bidi. [DO NOT MERGE]

10 years agoam ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 21:45:28 +0000 (21:45 +0000)]
am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]

* commit 'ccf7b2aac600b6069f03f7f420872b64cc5e6726':
  Fix style resolution for styles with '.' [DO NOT MERGE]

10 years agoam 85c7b209: am 5efee91e: Merge "Fix style resolution for styles with \'.\' [DO NOT...
Deepanshu Gupta [Fri, 18 Jul 2014 21:45:20 +0000 (21:45 +0000)]
am 85c7b209: am 5efee91e: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr2-dev

* commit '85c7b209c3babea164f5bec13352e7f5f262ea58':
  Fix style resolution for styles with '.' [DO NOT MERGE]

10 years agoam 95bbeb96: am b8e4e8e1: am d3ac01ff: Merge "Fix style resolution for styles with...
Deepanshu Gupta [Fri, 18 Jul 2014 21:45:19 +0000 (21:45 +0000)]
am 95bbeb96: am b8e4e8e1: am d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev

* commit '95bbeb967243d453bf793cd06dd2dd914667fee9':
  Fix style resolution for styles with '.' [DO NOT MERGE]

10 years agoam c3a7763b: (-s ours) am 918ca12f: am 10395cbb: Fix default level flags for bidi...
Deepanshu Gupta [Fri, 18 Jul 2014 21:44:52 +0000 (21:44 +0000)]
am c3a7763b: (-s ours) am 918ca12f: am 10395cbb: Fix default level flags for bidi. [DO NOT MERGE]

* commit 'c3a7763b84a6a20f07ed2b42e58ac0911fac984c':
  Fix default level flags for bidi. [DO NOT MERGE]

10 years agoam 696eb4da: (-s ours) am c39916f7: am 37f54f4c: am 357ebfc5: Fix default level flags...
Deepanshu Gupta [Fri, 18 Jul 2014 21:44:11 +0000 (21:44 +0000)]
am 696eb4da: (-s ours) am c39916f7: am 37f54f4c: am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE]

* commit '696eb4da44097693a18e99e1f38d062ac1f0e147':
  Fix default level flags for bidi. [DO NOT MERGE]

10 years agoam 4627c98d: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into...
Deepanshu Gupta [Fri, 18 Jul 2014 21:42:10 +0000 (21:42 +0000)]
am 4627c98d: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into klp-dev

* commit '4627c98da4ecb66e32a3273ea3713df528cda6b2':
  Fix style resolution for styles with '.' [DO NOT MERGE]

10 years agoam b8e4e8e1: am d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT...
Deepanshu Gupta [Fri, 18 Jul 2014 21:41:18 +0000 (21:41 +0000)]
am b8e4e8e1: am d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev

* commit 'b8e4e8e1f4fb1139368dc3f36e2d7bcf59dc32e9':
  Fix style resolution for styles with '.' [DO NOT MERGE]

10 years agoam c425c438: am 710a55b4: Fix default level flags for bidi. [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 21:39:42 +0000 (21:39 +0000)]
am c425c438: am 710a55b4: Fix default level flags for bidi. [DO NOT MERGE]

* commit 'c425c438a38f9065c4fbae76602bce66563950c0':
  Fix default level flags for bidi. [DO NOT MERGE]

10 years agoam 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 21:39:35 +0000 (21:39 +0000)]
am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]

* commit '5af7324ace4f318d7395b680beabec7a0f0e39b3':
  Fix style resolution for styles with '.' [DO NOT MERGE]

10 years agoam c39916f7: am 37f54f4c: am 357ebfc5: Fix default level flags for bidi. [DO NOT...
Deepanshu Gupta [Fri, 18 Jul 2014 21:39:33 +0000 (21:39 +0000)]
am c39916f7: am 37f54f4c: am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE]

* commit 'c39916f7dadb2f8be2e7523c5ceade9f04a94e1e':
  Fix default level flags for bidi. [DO NOT MERGE]

10 years agoam 5efee91e: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into...
Deepanshu Gupta [Fri, 18 Jul 2014 21:39:25 +0000 (21:39 +0000)]
am 5efee91e: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr2-dev

* commit '5efee91e12420e59214946c526f80961738a9c1d':
  Fix style resolution for styles with '.' [DO NOT MERGE]

10 years agoam d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into...
Deepanshu Gupta [Fri, 18 Jul 2014 21:38:39 +0000 (21:38 +0000)]
am d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev

* commit 'd3ac01ff7616f7135b8b5044816690c93fba8548':
  Fix style resolution for styles with '.' [DO NOT MERGE]

10 years agoam 918ca12f: am 10395cbb: Fix default level flags for bidi. [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 21:36:29 +0000 (21:36 +0000)]
am 918ca12f: am 10395cbb: Fix default level flags for bidi. [DO NOT MERGE]

* commit '918ca12ffc09a96194112edf3540d94c32918a07':
  Fix default level flags for bidi. [DO NOT MERGE]

10 years agoam 37f54f4c: am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 21:35:21 +0000 (21:35 +0000)]
am 37f54f4c: am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE]

* commit '37f54f4c1e2d97b33bdd8abe5f196debecc5437d':
  Fix default level flags for bidi. [DO NOT MERGE]

10 years agoam 710a55b4: Fix default level flags for bidi. [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 21:32:52 +0000 (21:32 +0000)]
am 710a55b4: Fix default level flags for bidi. [DO NOT MERGE]

* commit '710a55b419908068529a8e95c4eba88297f67e3f':
  Fix default level flags for bidi. [DO NOT MERGE]

10 years agoam 10395cbb: Fix default level flags for bidi. [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 21:31:33 +0000 (21:31 +0000)]
am 10395cbb: Fix default level flags for bidi. [DO NOT MERGE]

* commit '10395cbb5cdec35a0ebee1d0b18b58c4803092a1':
  Fix default level flags for bidi. [DO NOT MERGE]

10 years agoam 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE]
Deepanshu Gupta [Fri, 18 Jul 2014 21:31:26 +0000 (21:31 +0000)]
am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE]

* commit '357ebfc5e43ecb35da9207d78a9a8a6c117a1002':
  Fix default level flags for bidi. [DO NOT MERGE]

10 years agoam b477fc6c: Merge "add command to enable bt snoop log" into klp-modular-dev
Guang Zhu [Fri, 18 Jul 2014 03:31:43 +0000 (03:31 +0000)]
am b477fc6c: Merge "add command to enable bt snoop log" into klp-modular-dev

* commit 'b477fc6c2fcd04e6952a7eec856d30b64fd95e0c':
  add command to enable bt snoop log

10 years agoMerge "Fix style resolution for styles with '.' [DO NOT MERGE]" into klp-dev
Deepanshu Gupta [Fri, 18 Jul 2014 21:33:28 +0000 (21:33 +0000)]
Merge "Fix style resolution for styles with '.' [DO NOT MERGE]" into klp-dev

10 years agoMerge "Fix style resolution for styles with '.' [DO NOT MERGE]" into jb-mr2-dev
Deepanshu Gupta [Fri, 18 Jul 2014 21:33:40 +0000 (21:33 +0000)]
Merge "Fix style resolution for styles with '.' [DO NOT MERGE]" into jb-mr2-dev

10 years agoMerge "Fix style resolution for styles with '.' [DO NOT MERGE]" into jb-mr1.1-dev
Deepanshu Gupta [Fri, 18 Jul 2014 21:33:46 +0000 (21:33 +0000)]
Merge "Fix style resolution for styles with '.' [DO NOT MERGE]" into jb-mr1.1-dev

10 years agoam 7a425360: am 25303a98: Merge "docs: Fixed RecyclerView example. Bug: 15973665...
Ricardo Cervera [Thu, 17 Jul 2014 20:34:58 +0000 (20:34 +0000)]
am 7a425360: am 25303a98: Merge "docs: Fixed RecyclerView example. Bug: 15973665" into klp-modular-docs

* commit '7a4253608397e647e2f04a1b14d0f02f3d695336':
  docs: Fixed RecyclerView example. Bug: 15973665

10 years agoam 25303a98: Merge "docs: Fixed RecyclerView example. Bug: 15973665" into klp-modular...
Ricardo Cervera [Thu, 17 Jul 2014 20:31:01 +0000 (20:31 +0000)]
am 25303a98: Merge "docs: Fixed RecyclerView example. Bug: 15973665" into klp-modular-docs

* commit '25303a980c026aab3ba0a01ce2a51122eb9982c2':
  docs: Fixed RecyclerView example. Bug: 15973665

10 years agoam 049cadd8: am f1b18ded: Merge "docs: Fix typo in Wear docs. Bug: 16327298" into...
Robert Ly [Thu, 17 Jul 2014 20:30:32 +0000 (20:30 +0000)]
am 049cadd8: am f1b18ded: Merge "docs: Fix typo in Wear docs. Bug: 16327298" into klp-modular-docs

* commit '049cadd8c965ad69b875cd5ed7768c1b162acb39':
  docs: Fix typo in Wear docs. Bug: 16327298

10 years agoam f1b18ded: Merge "docs: Fix typo in Wear docs. Bug: 16327298" into klp-modular...
Robert Ly [Thu, 17 Jul 2014 20:27:03 +0000 (20:27 +0000)]
am f1b18ded: Merge "docs: Fix typo in Wear docs. Bug: 16327298" into klp-modular-docs

* commit 'f1b18ded01adf94ee34dbd95a86616d8eadbdf06':
  docs: Fix typo in Wear docs. Bug: 16327298

10 years agoam 9353e1a2: Merge "Make the booting flag update unconditional" into klp-modular-dev
Prashant Malani [Thu, 17 Jul 2014 19:55:32 +0000 (19:55 +0000)]
am 9353e1a2: Merge "Make the booting flag update unconditional" into klp-modular-dev

* commit '9353e1a2b2e8f02377c3f73565964ffb0927c776':
  Make the booting flag update unconditional

10 years agoam a76164e1: Merge "Only use bottom outset for main display." into klp-modular-dev
Filip Gruszczynski [Thu, 17 Jul 2014 19:55:27 +0000 (19:55 +0000)]
am a76164e1: Merge "Only use bottom outset for main display." into klp-modular-dev

* commit 'a76164e1d0d283baf412c18999e680d93bd50f01':
  Only use bottom outset for main display.

10 years agoMerge "add command to enable bt snoop log" into klp-modular-dev
Guang Zhu [Fri, 18 Jul 2014 03:28:10 +0000 (03:28 +0000)]
Merge "add command to enable bt snoop log" into klp-modular-dev

10 years agoadd command to enable bt snoop log
Guang Zhu [Fri, 18 Jul 2014 03:24:56 +0000 (20:24 -0700)]
add command to enable bt snoop log

Change-Id: I22a6482a90c2bb976a5ce44946e9f0fb8b59e6b2

10 years agoMerge "Make the booting flag update unconditional" into klp-modular-dev
Prashant Malani [Thu, 17 Jul 2014 19:52:27 +0000 (19:52 +0000)]
Merge "Make the booting flag update unconditional" into klp-modular-dev

10 years agoMerge "docs: Fix typo in Wear docs. Bug: 16327298" into klp-modular-docs
Robert Ly [Thu, 17 Jul 2014 20:23:20 +0000 (20:23 +0000)]
Merge "docs: Fix typo in Wear docs. Bug: 16327298" into klp-modular-docs

10 years agoMerge "Only use bottom outset for main display." into klp-modular-dev
Filip Gruszczynski [Thu, 17 Jul 2014 19:52:25 +0000 (19:52 +0000)]
Merge "Only use bottom outset for main display." into klp-modular-dev

10 years agoOnly use bottom outset for main display.
Filip Gruszczynski [Wed, 16 Jul 2014 23:35:18 +0000 (16:35 -0700)]
Only use bottom outset for main display.

Change-Id: I42154d026811ee4b7ba9711c560c7a62fcdde7ee

10 years agoam e1e81a9e: am e287cf33: docs: Update ADT-1 page with supported apps
Joe Fernandez [Thu, 17 Jul 2014 18:04:47 +0000 (18:04 +0000)]
am e1e81a9e: am e287cf33: docs: Update ADT-1 page with supported apps

* commit 'e1e81a9ee0f3632898eff1056fd2283b79789e23':
  docs: Update ADT-1 page with supported apps

10 years agoMerge "Minor typos, consistency things, one grammatical error." into klp-modular...
David Friedman [Sun, 20 Jul 2014 07:55:17 +0000 (07:55 +0000)]
Merge "Minor typos, consistency things, one grammatical error." into klp-modular-docs

10 years agoMinor typos, consistency things, one grammatical error.
David Friedman [Fri, 18 Jul 2014 09:28:54 +0000 (02:28 -0700)]
Minor typos, consistency things, one grammatical error.

Change-Id: I65ad160b9c49bc9c7e762d3628e69c518742ef4c

10 years agoam e287cf33: docs: Update ADT-1 page with supported apps
Joe Fernandez [Thu, 17 Jul 2014 16:44:19 +0000 (16:44 +0000)]
am e287cf33: docs: Update ADT-1 page with supported apps

* commit 'e287cf33d4cd69aef2177d025a110cf8b9f0e267':
  docs: Update ADT-1 page with supported apps

10 years agoam 65d7c332: Merge "Additional cleanup after stack deletion." into klp-modular-dev
Justin Koh [Thu, 17 Jul 2014 10:56:16 +0000 (10:56 +0000)]
am 65d7c332: Merge "Additional cleanup after stack deletion." into klp-modular-dev

* commit '65d7c332d7b613f23a26066051cc7496e0efa994':
  Additional cleanup after stack deletion.

10 years agoam 77cdac05: Merge "Wait for all windows to draw before turning screen on" into klp...
Justin Koh [Thu, 17 Jul 2014 10:55:56 +0000 (10:55 +0000)]
am 77cdac05: Merge "Wait for all windows to draw before turning screen on" into klp-modular-dev

* commit '77cdac05ba80925f6cdc4c349af0fa7567c36146':
  Wait for all windows to draw before turning screen on

10 years agoam 39f0e7da: Merge "Using outset bottom from theme as bottom inset on circular screen...
Filip Gruszczynski [Thu, 17 Jul 2014 10:55:43 +0000 (10:55 +0000)]
am 39f0e7da: Merge "Using outset bottom from theme as bottom inset on circular screens." into klp-modular-dev

* commit '39f0e7da00eae4e5a331a9413a396f3dddbeb625':
  Using outset bottom from theme as bottom inset on circular screens.

10 years agoMerge "docs: Fixed RecyclerView example. Bug: 15973665" into klp-modular-docs
Ricardo Cervera [Thu, 17 Jul 2014 20:25:34 +0000 (20:25 +0000)]
Merge "docs: Fixed RecyclerView example. Bug: 15973665" into klp-modular-docs

10 years agoMerge "Using outset bottom from theme as bottom inset on circular screens." into...
Filip Gruszczynski [Thu, 17 Jul 2014 00:23:35 +0000 (00:23 +0000)]
Merge "Using outset bottom from theme as bottom inset on circular screens." into klp-modular-dev

10 years agoUsing outset bottom from theme as bottom inset on circular screens.
Filip Gruszczynski [Tue, 15 Jul 2014 00:10:42 +0000 (17:10 -0700)]
Using outset bottom from theme as bottom inset on circular screens.

Change-Id: I46374b345e60a74b6afbbb6a278a0b8e81650681

10 years agodocs: Update ADT-1 page with supported apps
Joe Fernandez [Wed, 16 Jul 2014 23:22:51 +0000 (16:22 -0700)]
docs: Update ADT-1 page with supported apps

Change-Id: I7281767e3a51ce518f4e14f0751ba71859e16d24

10 years agoMerge "Additional cleanup after stack deletion." into klp-modular-dev
Justin Koh [Thu, 17 Jul 2014 00:57:51 +0000 (00:57 +0000)]
Merge "Additional cleanup after stack deletion." into klp-modular-dev