117630 Commits

Author SHA1 Message Date
Dirk Dougherty
f365928406 Doc change: add reminder for developers on using ad id.
Change-Id: I2a6109bd1b97e4432e36c6a5055aee6e2b1c3edd
2014-07-21 22:15:04 +00:00
Deepanshu Gupta
d32dd2948d 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]
2014-07-18 22:31:17 +00:00
Deepanshu Gupta
b86675f14b 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]
2014-07-18 22:26:45 +00:00
Deepanshu Gupta
f2c5a9ee49 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]
2014-07-18 22:22:24 +00:00
Deepanshu Gupta
b9efa1e5a1 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]
2014-07-18 22:17:00 +00:00
Deepanshu Gupta
14a4e69cc6 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]
2014-07-18 22:12:02 +00:00
Deepanshu Gupta
c735197420 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]
2014-07-18 22:07:40 +00:00
Deepanshu Gupta
3f51ab0d81 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]
2014-07-18 22:07:31 +00:00
Deepanshu Gupta
3c92b93226 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]
2014-07-18 22:02:14 +00:00
Deepanshu Gupta
c35afdfd4c 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]
2014-07-18 22:02:07 +00:00
Deepanshu Gupta
a3966c66ee 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]
2014-07-18 22:01:45 +00:00
Deepanshu Gupta
627439401e 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]
2014-07-18 21:58:42 +00:00
Deepanshu Gupta
7f98066dd1 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]
2014-07-18 21:57:44 +00:00
Deepanshu Gupta
62b81acbca 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]
2014-07-18 21:57:16 +00:00
Deepanshu Gupta
cee55fc19b 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]
2014-07-18 21:57:01 +00:00
Deepanshu Gupta
8c71ff298b 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]
2014-07-18 21:55:21 +00:00
Deepanshu Gupta
99286edc3e 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]
2014-07-18 21:53:15 +00:00
Deepanshu Gupta
2df48bed6a 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]
2014-07-18 21:53:11 +00:00
Deepanshu Gupta
4c312f20ca 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]
2014-07-18 21:52:52 +00:00
Deepanshu Gupta
efd29681d8 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]
2014-07-18 21:50:15 +00:00
Deepanshu Gupta
87234e8544 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]
2014-07-18 21:50:15 +00:00
Deepanshu Gupta
aa0c1c755c 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]
2014-07-18 21:49:13 +00:00
Deepanshu Gupta
1bdfeadb61 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]
2014-07-18 21:49:11 +00:00
Deepanshu Gupta
9c48ab8208 am ccf7b2aa: am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]
* commit 'ccf7b2aac600b6069f03f7f420872b64cc5e6726':
  Fix style resolution for styles with '.' [DO NOT MERGE]
2014-07-18 21:45:28 +00:00
Deepanshu Gupta
a3d2c7e72b 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]
2014-07-18 21:45:20 +00:00
Deepanshu Gupta
610341b3eb 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]
2014-07-18 21:45:19 +00:00
Deepanshu Gupta
964591a6e1 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]
2014-07-18 21:44:52 +00:00
Deepanshu Gupta
e83fa180a8 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]
2014-07-18 21:44:11 +00:00
Deepanshu Gupta
d8d3e87cf3 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]
2014-07-18 21:42:10 +00:00
Deepanshu Gupta
95bbeb9672 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]
2014-07-18 21:41:18 +00:00
Deepanshu Gupta
ccf7b2aac6 am 5af7324a: Fix style resolution for styles with \'.\' [DO NOT MERGE]
* commit '5af7324ace4f318d7395b680beabec7a0f0e39b3':
  Fix style resolution for styles with '.' [DO NOT MERGE]
2014-07-18 21:39:35 +00:00
Deepanshu Gupta
696eb4da44 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]
2014-07-18 21:39:33 +00:00
Deepanshu Gupta
85c7b209c3 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]
2014-07-18 21:39:25 +00:00
Deepanshu Gupta
b8e4e8e1f4 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]
2014-07-18 21:38:39 +00:00
Deepanshu Gupta
c3a7763b84 am 918ca12f: am 10395cbb: Fix default level flags for bidi. [DO NOT MERGE]
* commit '918ca12ffc09a96194112edf3540d94c32918a07':
  Fix default level flags for bidi. [DO NOT MERGE]
2014-07-18 21:36:29 +00:00
Deepanshu Gupta
c39916f7da am 37f54f4c: am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE]
* commit '37f54f4c1e2d97b33bdd8abe5f196debecc5437d':
  Fix default level flags for bidi. [DO NOT MERGE]
2014-07-18 21:35:21 +00:00
Deepanshu Gupta
c425c438a3 am 710a55b4: Fix default level flags for bidi. [DO NOT MERGE]
* commit '710a55b419908068529a8e95c4eba88297f67e3f':
  Fix default level flags for bidi. [DO NOT MERGE]
2014-07-18 21:32:52 +00:00
Deepanshu Gupta
918ca12ffc am 10395cbb: Fix default level flags for bidi. [DO NOT MERGE]
* commit '10395cbb5cdec35a0ebee1d0b18b58c4803092a1':
  Fix default level flags for bidi. [DO NOT MERGE]
2014-07-18 21:31:33 +00:00
Deepanshu Gupta
37f54f4c1e am 357ebfc5: Fix default level flags for bidi. [DO NOT MERGE]
* commit '357ebfc5e43ecb35da9207d78a9a8a6c117a1002':
  Fix default level flags for bidi. [DO NOT MERGE]
2014-07-18 21:31:26 +00:00
Deepanshu Gupta
4627c98da4 Merge "Fix style resolution for styles with '.' [DO NOT MERGE]" into klp-dev 2014-07-17 21:09:48 +00:00
Deepanshu Gupta
5efee91e12 Merge "Fix style resolution for styles with '.' [DO NOT MERGE]" into jb-mr2-dev 2014-07-17 21:09:48 +00:00
Deepanshu Gupta
d3ac01ff76 Merge "Fix style resolution for styles with '.' [DO NOT MERGE]" into jb-mr1.1-dev 2014-07-17 21:04:20 +00:00
Deepanshu Gupta
357ebfc5e4 Fix default level flags for bidi. [DO NOT MERGE]
Bug: b.android.com/69432
Change-Id: I26ff34a6d1f85c928a9a1cb3dfd739fc7d3a8fb6
(cherry picked from commit 95e636130dfc2c0203f16f5315a7fe14b03eb689)
2014-07-12 02:10:50 +00:00
Deepanshu Gupta
10395cbb5c Fix default level flags for bidi. [DO NOT MERGE]
Bug: b.android.com/69432
Change-Id: I26ff34a6d1f85c928a9a1cb3dfd739fc7d3a8fb6
(cherry picked from commit 95e636130dfc2c0203f16f5315a7fe14b03eb689)
2014-07-12 02:10:33 +00:00
Deepanshu Gupta
710a55b419 Fix default level flags for bidi. [DO NOT MERGE]
Bug: b.android.com/69432
Change-Id: I26ff34a6d1f85c928a9a1cb3dfd739fc7d3a8fb6
(cherry picked from commit 95e636130dfc2c0203f16f5315a7fe14b03eb689)
2014-07-12 02:10:02 +00:00
Deepanshu Gupta
5af7324ace Fix style resolution for styles with '.' [DO NOT MERGE]
Bug: b.android.com/72698
Change-Id: I96fb549cf5787d9e8cde2245524a8173471a60ca
(cherry picked from commit f2fa79e9b56b71f8aa30e6675255df69f88a173d)
2014-07-10 00:30:03 +00:00
Deepanshu Gupta
da28101757 Fix style resolution for styles with '.' [DO NOT MERGE]
Bug: b.android.com/72698
Change-Id: I96fb549cf5787d9e8cde2245524a8173471a60ca
(cherry picked from commit f2fa79e9b56b71f8aa30e6675255df69f88a173d)
2014-07-10 00:29:41 +00:00
Deepanshu Gupta
0f49025998 Fix style resolution for styles with '.' [DO NOT MERGE]
Bug: b.android.com/72698
Change-Id: I96fb549cf5787d9e8cde2245524a8173471a60ca
(cherry picked from commit f2fa79e9b56b71f8aa30e6675255df69f88a173d)
2014-07-10 00:29:15 +00:00
Deepanshu Gupta
f2fa79e9b5 Fix style resolution for styles with '.' [DO NOT MERGE]
Bug: b.android.com/72698
Change-Id: I96fb549cf5787d9e8cde2245524a8173471a60ca
2014-07-09 17:27:07 -07:00
Deepanshu Gupta
e7ef4dde3c am 575e334d: am 813e2ac3: (-s ours) am bda28629: am 1e344694: am 0b487604: (-s ours) am d53a9fcb: am 979f9c68: am e30d3fdd: Change font family name. [DO NOT MERGE]
* commit '575e334d1d132321155d9afddc5733cfd5e58b2d':
  Change font family name. [DO NOT MERGE]
2014-07-08 23:57:43 +00:00