OSDN Git Service
Deepanshu Gupta [Fri, 2 May 2014 19:34:34 +0000 (19:34 +0000)]
am
500a3139: (-s ours) am
7a0985ec: am
f8144032: Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
* commit '
500a3139def6ac57dbf48b0dc505a9876f5c9d63':
Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:34:31 +0000 (19:34 +0000)]
am
efa617f9: (-s ours) am
15994863: am
89fdc0c5: Layoutlib tests now check methods return value [DO NOT MERGE]
* commit '
efa617f9fe4cbf5449d735118bf39fcfbc1dbf74':
Layoutlib tests now check methods return value [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:34:28 +0000 (19:34 +0000)]
am
a9b296a5: (-s ours) am
edd048fb: am
d4f0073f: Remove references to java package class Objects. [DO NOT MERGE]
* commit '
a9b296a57e3f23870bf869727e18b3f055b86c06':
Remove references to java package class Objects. [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:30:24 +0000 (19:30 +0000)]
am
7a0985ec: am
f8144032: Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
* commit '
7a0985ec245e3b587f4725f7ae6856c85bc41346':
Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:30:21 +0000 (19:30 +0000)]
am
15994863: am
89fdc0c5: Layoutlib tests now check methods return value [DO NOT MERGE]
* commit '
15994863df716d78ad384bddfb9b71f65a9b2ac9':
Layoutlib tests now check methods return value [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:30:18 +0000 (19:30 +0000)]
am
edd048fb: am
d4f0073f: Remove references to java package class Objects. [DO NOT MERGE]
* commit '
edd048fb546ff62c0e285455adf94280237f56c4':
Remove references to java package class Objects. [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:23:44 +0000 (19:23 +0000)]
am
f8144032: Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
* commit '
f8144032d1fb7319bfd24914b12597505cfcc91f':
Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:23:42 +0000 (19:23 +0000)]
am
89fdc0c5: Layoutlib tests now check methods return value [DO NOT MERGE]
* commit '
89fdc0c556cf0fe2562fb8f0476e03cd51045164':
Layoutlib tests now check methods return value [DO NOT MERGE]
Deepanshu Gupta [Fri, 2 May 2014 19:23:39 +0000 (19:23 +0000)]
am
d4f0073f: Remove references to java package class Objects. [DO NOT MERGE]
* commit '
d4f0073f4805cd1036218f243d9b7c7c5bb90e41':
Remove references to java package class Objects. [DO NOT MERGE]
Deepanshu Gupta [Wed, 30 Apr 2014 02:37:01 +0000 (19:37 -0700)]
Fix class name for OverflowMenuButton [DO NOT MERGE]
Change-Id: Ie3e709e7aadb2193397df8befef0c55624d7e4e3
Deepanshu Gupta [Fri, 25 Apr 2014 18:07:19 +0000 (11:07 -0700)]
Add special system view cookie to OverflowButton. [DO NOT MERGE]
Add a special view cookie to enable the IDE to identify the overflow
menu button in the Action Bar.
Change-Id: Ida3ed776afb8c9fa8af23b73d4cf6d47eef0ab87
(cherry picked from commit
674af92fd3a618695448ff88568b03390e90bc66)
Deepanshu Gupta [Tue, 1 Apr 2014 01:59:45 +0000 (18:59 -0700)]
Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
The bug caused some classes to be missed when computing the dependencies
of the existing classes.
Change-Id: I7285ff67e016ce5d73a8550501f49acc73cfadfa
(cherry-picked from
6f9baea47757fef4745de434e09bd552fddc1f03)
Deepanshu Gupta [Wed, 16 Apr 2014 02:30:35 +0000 (19:30 -0700)]
Layoutlib tests now check methods return value [DO NOT MERGE]
The change is a cherry-pick from klp-dev.
The change also fixes the errors found by fixing the tests.
Change-Id: I87cef323c4eaee4e9f60475f01156b276593fa50
(cherry-picked from commit
bdd0ad79b9b027280bd371c7b6795b04ed89ac8f)
Deepanshu Gupta [Fri, 18 Oct 2013 03:06:44 +0000 (20:06 -0700)]
Remove references to java package class Objects. [DO NOT MERGE]
Remove references to Java 7 class java.util.Objects and replace it with
a new class that can be loaded on Java 6.
Change-Id: Ibbd9b20b8bc89e247f1d0c48d743d06d1a4f0704
(cherry-picked from commit
45f5cd49fa898a59484edfd8e291dbe10df82db2)
Deepanshu Gupta [Thu, 24 Apr 2014 01:21:54 +0000 (01:21 +0000)]
Merge "Fix style warnings in RenderSessionImpl [DO NOT MERGE]" into klp-dev
Deepanshu Gupta [Thu, 24 Apr 2014 01:21:45 +0000 (01:21 +0000)]
Merge "Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]" into klp-dev
Deepanshu Gupta [Wed, 23 Apr 2014 00:22:32 +0000 (17:22 -0700)]
Fix style warnings in RenderSessionImpl [DO NOT MERGE]
Change-Id: I9d3cb23e4ea692f737a3e3d6c18cc8de18b66a3c
(cherry-picked from commit
fbfeb1a90b6f8f3966c60a69d50ce8f608d9d861)
Deepanshu Gupta [Fri, 18 Apr 2014 19:32:38 +0000 (12:32 -0700)]
Add view cookies for action bar menus. [DO NOT MERGE]
The change adds the view cookies for the menus rendered in the action
bar. This enables the IDE to map the menu to the relevant XML Tag in the
menu xml and show the highlighting accordingly.
The change also contains a bugfix where a method wasn't renamed
properly.
Change-Id: Idcfc263a8ebe0a4f25afa3a1eb085fa628fd03ca
(cherry-picked from commit
1001961f904bac5294aaf73a47c2497aa764bf7f)
Deepanshu Gupta [Tue, 1 Apr 2014 01:59:45 +0000 (18:59 -0700)]
Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
The bug caused some classes to be missed when computing the dependencies
of the existing classes.
Change-Id: I7285ff67e016ce5d73a8550501f49acc73cfadfa
(cherry-picked from
4a0f93bd32b8dd9b3c351680ad82e461d5111f38)
Mike Lockwood [Mon, 21 Apr 2014 15:49:30 +0000 (08:49 -0700)]
MTP: Fix getThumbnail
The thumbnail size was not being passed to the MTP stack so getThumbnail
was returning zero length data.
Bug:
13747419
Change-Id: I309d35b5c46ab5f631c0dcb5981f7896bb5a2ed5
Kenny Root [Fri, 18 Apr 2014 23:00:37 +0000 (23:00 +0000)]
am
e00c9185: am
41ec218e: am
6888bee5: am
5a0cc789: am
2ed5f771: am
47231936: am
02bc4b04: am
4a62a6dc: am
451ed5f0: am
3ecaa88d: am
ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev
* commit '
e00c9185262c675f1680920c258413299995042a':
Use hidden API to validate APK chains
Kenny Root [Fri, 18 Apr 2014 22:56:26 +0000 (22:56 +0000)]
am
41ec218e: am
6888bee5: am
5a0cc789: am
2ed5f771: am
47231936: am
02bc4b04: am
4a62a6dc: am
451ed5f0: am
3ecaa88d: am
ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev
* commit '
41ec218e5f92904fe99c74bc35b9f5e4003c777a':
Use hidden API to validate APK chains
Kenny Root [Fri, 18 Apr 2014 22:50:12 +0000 (22:50 +0000)]
am
6888bee5: am
5a0cc789: am
2ed5f771: am
47231936: am
02bc4b04: am
4a62a6dc: am
451ed5f0: am
3ecaa88d: am
ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev
* commit '
6888bee598b8c88f7a93ef2da06dd5659cc92dc6':
Use hidden API to validate APK chains
Kenny Root [Fri, 18 Apr 2014 22:43:08 +0000 (22:43 +0000)]
am
5a0cc789: am
2ed5f771: am
47231936: am
02bc4b04: am
4a62a6dc: am
451ed5f0: am
3ecaa88d: am
ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev
* commit '
5a0cc78929bf56c153696ffa16b602acfcc40089':
Use hidden API to validate APK chains
Kenny Root [Fri, 18 Apr 2014 22:37:38 +0000 (22:37 +0000)]
am
2ed5f771: am
47231936: am
02bc4b04: am
4a62a6dc: am
451ed5f0: am
3ecaa88d: am
ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev
* commit '
2ed5f771c47c16e9c2be1f2025ef0a826f0290c3':
Use hidden API to validate APK chains
Kenny Root [Fri, 18 Apr 2014 22:31:08 +0000 (22:31 +0000)]
am
47231936: am
02bc4b04: am
4a62a6dc: am
451ed5f0: am
3ecaa88d: am
ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev
* commit '
47231936c0593b87c3c9898767327f1516a7ec22':
Use hidden API to validate APK chains
Kenny Root [Fri, 18 Apr 2014 22:26:03 +0000 (22:26 +0000)]
am
02bc4b04: am
4a62a6dc: am
451ed5f0: am
3ecaa88d: am
ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev
* commit '
02bc4b04239c437f88fdb82633b41cdc8a8eff6b':
Use hidden API to validate APK chains
Kenny Root [Fri, 18 Apr 2014 22:21:37 +0000 (22:21 +0000)]
am
4a62a6dc: am
451ed5f0: am
3ecaa88d: am
ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev
* commit '
4a62a6dce9a4b48f1c1c64e47a22d2319b852acd':
Use hidden API to validate APK chains
Kenny Root [Fri, 18 Apr 2014 22:14:14 +0000 (22:14 +0000)]
am
451ed5f0: am
3ecaa88d: am
ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev
* commit '
451ed5f077b9f95deae809ae620bc210c253b922':
Use hidden API to validate APK chains
Kenny Root [Fri, 18 Apr 2014 21:33:04 +0000 (21:33 +0000)]
am
3ecaa88d: am
ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev
* commit '
3ecaa88d83d04a0fd55b494829badbb41016f5a1':
Use hidden API to validate APK chains
Kenny Root [Fri, 18 Apr 2014 18:14:32 +0000 (18:14 +0000)]
am
ecb013db: Merge "Use hidden API to validate APK chains" into jb-dev
* commit '
ecb013dbff5e33b95c49015fa375579e055911ae':
Use hidden API to validate APK chains
Kenny Root [Fri, 18 Apr 2014 17:12:40 +0000 (17:12 +0000)]
Merge "Use hidden API to validate APK chains" into jb-dev
Kenny Root [Thu, 17 Apr 2014 21:03:31 +0000 (14:03 -0700)]
Use hidden API to validate APK chains
Bug:
13678484
Change-Id: I28dedab74b0e24d47ab9f2190298156c909e9d54
Vinit Deshapnde [Thu, 17 Apr 2014 18:54:58 +0000 (18:54 +0000)]
Merge "Don't reset country code once it is persisted" into klp-dev
Vinit Deshapnde [Thu, 17 Apr 2014 18:05:21 +0000 (11:05 -0700)]
Don't reset country code once it is persisted
This change simply ignores resetting of country code by cellular
networks to avoid disconnecting existing wifi connections. It also
defers setting newly found country code until after existing Wifi
connection is torn down.
Also removes some dead code related to resetting of country codes.
Bug:
13894807
Change-Id: Ie2fcfdd4b3be8ba94542772c132fb1acb6a2c683
Deepanshu Gupta [Wed, 16 Apr 2014 18:43:50 +0000 (18:43 +0000)]
am
0aea4684: am
91f2a7cb: am
5a125053: Merge changes I66792c4d,I203b6783 into jb-mr2-dev
* commit '
0aea46840f5a520e511fdbd8561046ac9c665fcb':
Improve text rendering and measurement. [DO NOT MERGE]
Fix the measurement of text bounds. [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:43:47 +0000 (18:43 +0000)]
am
00312846: (-s ours) am
0fe63473: am
04b4f8d1: Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into jb-mr2-dev
* commit '
00312846e1e5513b3b32aa4fab399e51daf0c1b3':
Set default text style in layoutlib as NORMAL [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:43:44 +0000 (18:43 +0000)]
am
4eeaa61f: (-s ours) am
87e14187: am
fb120acd: Merge "Add methods for Time_Delegate [DO NOT MERGE]" into jb-mr2-dev
* commit '
4eeaa61f6b4b7b37712e1c385a75aa8a4b89e381':
Add methods for Time_Delegate [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:43:40 +0000 (18:43 +0000)]
am
b03e1176: (-s ours) am
533a52fe: am
b7fd6315: Merge "Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]" into jb-mr2-dev
* commit '
b03e1176df1e66a49a5649faf6994fa9ec1a9bea':
Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:43:38 +0000 (18:43 +0000)]
am
90b0b69c: (-s ours) am
014ac85f: am
f14cbb26: Merge "Optimize layout rendering in layoutlib [DO NOT MERGE]" into jb-mr2-dev
* commit '
90b0b69cd48067b92a90ea248ef91e473b7f1c10':
Optimize layout rendering in layoutlib [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:40:41 +0000 (18:40 +0000)]
am
91f2a7cb: am
5a125053: Merge changes I66792c4d,I203b6783 into jb-mr2-dev
* commit '
91f2a7cb303a3225f68f571ea101078eed1c1f94':
Improve text rendering and measurement. [DO NOT MERGE]
Fix the measurement of text bounds. [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:40:37 +0000 (18:40 +0000)]
am
0fe63473: am
04b4f8d1: Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into jb-mr2-dev
* commit '
0fe634737b24fd8f4dc8d0f49eb15ea176242428':
Set default text style in layoutlib as NORMAL [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:40:34 +0000 (18:40 +0000)]
am
87e14187: am
fb120acd: Merge "Add methods for Time_Delegate [DO NOT MERGE]" into jb-mr2-dev
* commit '
87e14187111254b8842193f4f3514c0dea50967d':
Add methods for Time_Delegate [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:40:30 +0000 (18:40 +0000)]
am
533a52fe: am
b7fd6315: Merge "Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]" into jb-mr2-dev
* commit '
533a52fe3bedc88483a968400cd61110bd29c704':
Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:40:25 +0000 (18:40 +0000)]
am
014ac85f: am
f14cbb26: Merge "Optimize layout rendering in layoutlib [DO NOT MERGE]" into jb-mr2-dev
* commit '
014ac85fecc969c205a11d1f20afe00cab713629':
Optimize layout rendering in layoutlib [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:37:02 +0000 (18:37 +0000)]
am
5a125053: Merge changes I66792c4d,I203b6783 into jb-mr2-dev
* commit '
5a1250532f159842c364accf02bcfd111a6b900b':
Improve text rendering and measurement. [DO NOT MERGE]
Fix the measurement of text bounds. [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:36:58 +0000 (18:36 +0000)]
am
04b4f8d1: Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into jb-mr2-dev
* commit '
04b4f8d11406c64b94797af67dd7530435187129':
Set default text style in layoutlib as NORMAL [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:36:55 +0000 (18:36 +0000)]
am
fb120acd: Merge "Add methods for Time_Delegate [DO NOT MERGE]" into jb-mr2-dev
* commit '
fb120acd841f7d8d0e1845f5bdd98abf35cb25b4':
Add methods for Time_Delegate [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:36:52 +0000 (18:36 +0000)]
am
b7fd6315: Merge "Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]" into jb-mr2-dev
* commit '
b7fd6315328c3a38fd7928f3dbb43f44227eb78b':
Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:36:48 +0000 (18:36 +0000)]
am
f14cbb26: Merge "Optimize layout rendering in layoutlib [DO NOT MERGE]" into jb-mr2-dev
* commit '
f14cbb26edcf0838cee333bf0d6ee686bf6de333':
Optimize layout rendering in layoutlib [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:34:11 +0000 (18:34 +0000)]
Merge changes I66792c4d,I203b6783 into jb-mr2-dev
* changes:
Improve text rendering and measurement. [DO NOT MERGE]
Fix the measurement of text bounds. [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 18:34:04 +0000 (18:34 +0000)]
Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into jb-mr2-dev
Deepanshu Gupta [Wed, 16 Apr 2014 18:33:47 +0000 (18:33 +0000)]
Merge "Add methods for Time_Delegate [DO NOT MERGE]" into jb-mr2-dev
Deepanshu Gupta [Wed, 16 Apr 2014 18:33:31 +0000 (18:33 +0000)]
Merge "Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]" into jb-mr2-dev
Deepanshu Gupta [Wed, 16 Apr 2014 18:33:10 +0000 (18:33 +0000)]
Merge "Optimize layout rendering in layoutlib [DO NOT MERGE]" into jb-mr2-dev
Deepanshu Gupta [Wed, 16 Apr 2014 02:30:35 +0000 (19:30 -0700)]
Layoutlib tests now check methods return value [DO NOT MERGE]
The change is a cherry-pick of relevant fixes from the following
commits on master branch:
the followning commits:
9be03c4e980d3058aeb3fd730da5f7d4a4a4f8a8 and
e05bb956ce429618fd4f971a9dc708b9313c59ea
Change-Id: I87cef323c4eaee4e9f60475f01156b276593fa50
Deepanshu Gupta [Wed, 12 Mar 2014 01:02:44 +0000 (18:02 -0700)]
Fix theme/style resolution in Layoutlib [DO NOT MERGE]
Change-Id: Icfb91e566666408802dadc0e2070991151b16b9d
(cherry picked from commit
bfec73c2db5a34ced248213edf5519c80727a65f)
Conflicts:
core/java/android/content/res/Resources.java
tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java
Deepanshu Gupta [Thu, 13 Feb 2014 01:37:46 +0000 (17:37 -0800)]
Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
Adds MenuBuilderAccessor in addition to the cherry-picked changes.
Change-Id: Ib7cc314079099c010f7d53849e204db36c410357
(cherry-picked from commit
929eea6bc1824bf98d244550c0984ecf8ea98811)
Deepanshu Gupta [Thu, 12 Dec 2013 20:16:24 +0000 (12:16 -0800)]
Action bar rendering in layoutlib [DO NOT MERGE]
This also makes a couple of changes to the framework:
1. ShareActionProvider - Use edit mode to execute activity chooser code.
2. ActionBarImpl - add a new constructor for use by layoutlib.
This also relies on some changes to the plugin to pass the correct params.
Change-Id: Ia30fef816afd91ec1e439734d56b59b1323bfee2
(cherry-picked from
14bf0cef7eeed572a67c29a328581afac4decc20)
Deepanshu Gupta [Wed, 9 Apr 2014 22:14:37 +0000 (15:14 -0700)]
Support custom views using TimePickerDialog [DO NOT MERGE]
Bug: http://b.android/com/61515
Change-Id: I0dc3357be0c058adde9d3ea5b6796004b786fd34
(cherry picked from commit
86e5218220a0e01f7eb574a2480bd91f9ebfae35)
Deepanshu Gupta [Tue, 25 Feb 2014 23:27:29 +0000 (15:27 -0800)]
Add DatePickerDialog to layoutlib [DO NOT MERGE]
Includes android.app.DatePickerDialog in the layoutlib.jar
Bug: http://b.android.com/28318
Change-Id: I583dde4a8b88204bf98bfca8d91470e1aa4719ce
(cherry picked from commit
c2016d4073c61e87439d4fa14837b397a3c1630a)
Robert Greenwalt [Mon, 7 Apr 2014 20:34:49 +0000 (20:34 +0000)]
am
a3d3e8c4: (-s ours) am
463eeb70: am
2676e36f: am
3e604b11: (-s ours) am
2c90609c: am
339cfdbd: am
72f9b308: am
4bc58bd2: am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
a3d3e8c4f92a637adc79ea21cc3c3ae49fe06312':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:27:50 +0000 (20:27 +0000)]
am
463eeb70: am
2676e36f: am
3e604b11: (-s ours) am
2c90609c: am
339cfdbd: am
72f9b308: am
4bc58bd2: am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
463eeb70938403bdca2519d9b71911aab93b9277':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:26:35 +0000 (20:26 +0000)]
am
522bd7fb: (-s ours) am
24444abf: am
53691e39: am
128e9371: (-s ours) am
106627e0: am
e42ce676: am
ebf23a8d: am
74acf23a: am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
522bd7fb3468bc07133c7ff1a02033dcced740b9':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:21:52 +0000 (20:21 +0000)]
am
2676e36f: am
3e604b11: (-s ours) am
2c90609c: am
339cfdbd: am
72f9b308: am
4bc58bd2: am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
2676e36ff6fc3f779cb6f1b0db13e26d734dcbab':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:18:41 +0000 (20:18 +0000)]
am
24444abf: am
53691e39: am
128e9371: (-s ours) am
106627e0: am
e42ce676: am
ebf23a8d: am
74acf23a: am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
24444abff4ad45b731d4f6cd92afed79568773d8':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:16:15 +0000 (20:16 +0000)]
am
3e604b11: (-s ours) am
2c90609c: am
339cfdbd: am
72f9b308: am
4bc58bd2: am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
3e604b1198fcab0e3bf2fd29043e4172193db2b5':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:12:56 +0000 (20:12 +0000)]
am
53691e39: am
128e9371: (-s ours) am
106627e0: am
e42ce676: am
ebf23a8d: am
74acf23a: am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
53691e39dca8be5dbe19bfef05b1c3e294d6c0bd':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:09:33 +0000 (20:09 +0000)]
am
2c90609c: am
339cfdbd: am
72f9b308: am
4bc58bd2: am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
2c90609c0bddb6fbe255e5632a1e6639e760290f':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:07:10 +0000 (20:07 +0000)]
am
128e9371: (-s ours) am
106627e0: am
e42ce676: am
ebf23a8d: am
74acf23a: am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
128e937108035b77537f279dc0bc85a116906819':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:03:55 +0000 (20:03 +0000)]
am
339cfdbd: am
72f9b308: am
4bc58bd2: am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
339cfdbde333984d02d189249f46e7b13317baed':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 20:00:33 +0000 (20:00 +0000)]
am
106627e0: am
e42ce676: am
ebf23a8d: am
74acf23a: am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
106627e07cecfa8a9bcc43578fde78652fc59eba':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 19:57:32 +0000 (19:57 +0000)]
am
72f9b308: am
4bc58bd2: am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
72f9b3084cf8bf0ca01ba52a853faeeb74acdad4':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 19:54:13 +0000 (19:54 +0000)]
am
e42ce676: am
ebf23a8d: am
74acf23a: am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
e42ce676f54742f2d47c26adaa90407c2cb8cec8':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 19:51:34 +0000 (19:51 +0000)]
am
4bc58bd2: am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
4bc58bd255f3a0cd9bb3a8f7a916a3cccb96ce6b':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 19:48:39 +0000 (19:48 +0000)]
am
ebf23a8d: am
74acf23a: am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
ebf23a8d9ef7eb2d14ef19bff5525eb16604da7c':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 19:47:49 +0000 (19:47 +0000)]
am
c0d94e7a: am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
c0d94e7ac6353757b7fa4d7f6fce75c5719c7e6e':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 19:42:49 +0000 (19:42 +0000)]
am
f52d1a56: am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
f52d1a56af8cc769c1019fbb0d8b7a2254fcc01b':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 19:42:32 +0000 (19:42 +0000)]
am
74acf23a: am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
74acf23a1eef75628c8fa9e2ff7ba08ed4258558':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 19:36:54 +0000 (19:36 +0000)]
am
fe38ff8d: DO NOT MERGE Sanitize WifiConfigs
* commit '
fe38ff8d36c4fa2e18f4c786692eeea5ebd94e9f':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 19:36:44 +0000 (19:36 +0000)]
am
3c417fbf: Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
* commit '
3c417fbf21133340cbbe3539d87c453f81ae3a9d':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Mon, 7 Apr 2014 19:30:10 +0000 (19:30 +0000)]
Merge "DO NOT MERGE Sanitize WifiConfigs" into jb-mr1-dev
Baligh Uddin [Fri, 4 Apr 2014 14:22:51 +0000 (14:22 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Deepanshu Gupta [Fri, 4 Apr 2014 02:07:45 +0000 (02:07 +0000)]
am
9bcfee1d: (-s ours) am
30e59135: am
c07a48be: Merge "Fix a bug in Nine Patch library. [DO NOT MERGE]" into jb-mr2-dev
* commit '
9bcfee1d3ebe9704937e6935ffe7eabd46ebbf08':
Fix a bug in Nine Patch library. [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 02:07:42 +0000 (02:07 +0000)]
am
d8b890da: (-s ours) am
af60289e: am
70dfe865: Merge "Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]" into jb-mr2-dev
* commit '
d8b890da785e386f08e0a3cf6b7094a23af3c8f2':
Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 02:07:39 +0000 (02:07 +0000)]
am
8152502e: (-s ours) am
07d5f94e: am
2eb5f9e5: Merge "Add libphonenumber to layoutlib.jar. [DO NOT MERGE]" into jb-mr2-dev
* commit '
8152502e93edfe2f50d678d6860d3c7d1a8b4865':
Add libphonenumber to layoutlib.jar. [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 02:07:36 +0000 (02:07 +0000)]
am
29b4986e: (-s ours) am
5c77c126: am
b6588c52: Merge "Fix NPE in layoutlib. [DO NOT MERGE]" into jb-mr2-dev
* commit '
29b4986ecce1592bd2fe62024bb187dded33c0af':
Fix NPE in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 02:07:32 +0000 (02:07 +0000)]
am
ce393373: (-s ours) am
ef9f3043: am
3bc5b23f: Merge "Fix layoutlib [DO NOT MERGE]" into jb-mr2-dev
* commit '
ce393373b73e1a1f30ce9bb41568d415cab7df49':
Fix layoutlib [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 02:07:28 +0000 (02:07 +0000)]
am
99939cce: (-s ours) am
6094daa2: am
ba0ce056: Merge "Fix text size in Fake Action Bar. [DO NOT MERGE]" into jb-mr2-dev
* commit '
99939cce702b6b5a01be351f1a0b406a16509103':
Fix text size in Fake Action Bar. [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 02:01:58 +0000 (02:01 +0000)]
am
30e59135: am
c07a48be: Merge "Fix a bug in Nine Patch library. [DO NOT MERGE]" into jb-mr2-dev
* commit '
30e59135b11d196cac2edd97d1ccca3471f3e398':
Fix a bug in Nine Patch library. [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 02:01:55 +0000 (02:01 +0000)]
am
af60289e: am
70dfe865: Merge "Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]" into jb-mr2-dev
* commit '
af60289e692b6b598d550371cc6e41e0b40dd6cd':
Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 02:01:51 +0000 (02:01 +0000)]
am
07d5f94e: am
2eb5f9e5: Merge "Add libphonenumber to layoutlib.jar. [DO NOT MERGE]" into jb-mr2-dev
* commit '
07d5f94e6b8a6d3f9caca057830e5cbd4cfa7dac':
Add libphonenumber to layoutlib.jar. [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 02:01:48 +0000 (02:01 +0000)]
am
5c77c126: am
b6588c52: Merge "Fix NPE in layoutlib. [DO NOT MERGE]" into jb-mr2-dev
* commit '
5c77c126b258924961a4a9c784177b4bcd403dd0':
Fix NPE in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 02:01:45 +0000 (02:01 +0000)]
am
ef9f3043: am
3bc5b23f: Merge "Fix layoutlib [DO NOT MERGE]" into jb-mr2-dev
* commit '
ef9f3043f5259fa55376a1522152779295e15da6':
Fix layoutlib [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 02:01:42 +0000 (02:01 +0000)]
am
6094daa2: am
ba0ce056: Merge "Fix text size in Fake Action Bar. [DO NOT MERGE]" into jb-mr2-dev
* commit '
6094daa2626e57c6bd24409f0934090581541e49':
Fix text size in Fake Action Bar. [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 01:54:13 +0000 (01:54 +0000)]
am
c07a48be: Merge "Fix a bug in Nine Patch library. [DO NOT MERGE]" into jb-mr2-dev
* commit '
c07a48bed2c772dc548423396b208331b22a679a':
Fix a bug in Nine Patch library. [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 01:54:10 +0000 (01:54 +0000)]
am
70dfe865: Merge "Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]" into jb-mr2-dev
* commit '
70dfe865013f0c8fedf2c9468360a41b02fcce0a':
Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 01:54:08 +0000 (01:54 +0000)]
am
2eb5f9e5: Merge "Add libphonenumber to layoutlib.jar. [DO NOT MERGE]" into jb-mr2-dev
* commit '
2eb5f9e5b25dc769e5ba205237097c67fa212fd6':
Add libphonenumber to layoutlib.jar. [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 01:54:05 +0000 (01:54 +0000)]
am
b6588c52: Merge "Fix NPE in layoutlib. [DO NOT MERGE]" into jb-mr2-dev
* commit '
b6588c522451f5015c2cbc902d5a72566f979f2b':
Fix NPE in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Fri, 4 Apr 2014 01:54:03 +0000 (01:54 +0000)]
am
3bc5b23f: Merge "Fix layoutlib [DO NOT MERGE]" into jb-mr2-dev
* commit '
3bc5b23f8dbb6ecc4eeac4334f94682056d0cb3b':
Fix layoutlib [DO NOT MERGE]