OSDN Git Service
Wink Saville [Thu, 8 Aug 2013 22:46:46 +0000 (15:46 -0700)]
am
9b6363e5: am
cbad1243: Merge "Check that hipri has started." into jb-mr2-dev
* commit '
9b6363e5e6d37e3e8d103751d81613eeca32bbbf':
Check that hipri has started.
Wink Saville [Thu, 8 Aug 2013 22:43:00 +0000 (15:43 -0700)]
am
cbad1243: Merge "Check that hipri has started." into jb-mr2-dev
* commit '
cbad1243ad901b8ffcb7497a8f440414b8d41898':
Check that hipri has started.
Wink Saville [Thu, 8 Aug 2013 22:03:44 +0000 (22:03 +0000)]
Merge "Check that hipri has started." into jb-mr2-dev
Joe Malin [Thu, 8 Aug 2013 17:20:40 +0000 (10:20 -0700)]
am
93bb7bf2: am
5986f497: Merge "Doc Change: Fix
10224981 error in code snippet" into jb-mr2-docs
* commit '
93bb7bf22df96368392199997aa401eef2c12a9c':
Doc Change: Fix
10224981 error in code snippet
Joe Malin [Thu, 8 Aug 2013 17:17:31 +0000 (10:17 -0700)]
am
5986f497: Merge "Doc Change: Fix
10224981 error in code snippet" into jb-mr2-docs
* commit '
5986f49751e563adf443baca589419e1eb9fbf84':
Doc Change: Fix
10224981 error in code snippet
Joe Malin [Thu, 8 Aug 2013 17:12:01 +0000 (17:12 +0000)]
Merge "Doc Change: Fix
10224981 error in code snippet" into jb-mr2-docs
Joe Malin [Wed, 7 Aug 2013 23:43:52 +0000 (16:43 -0700)]
Doc Change: Fix
10224981 error in code snippet
Change-Id: Ia8193989b0ab08f5b0888a4d3f6823018b48ab18
Dianne Hackborn [Wed, 7 Aug 2013 23:14:11 +0000 (16:14 -0700)]
am
9f11f105: am
7f09ec39: Fix issue #
10226007: Reset apps restores most of the changed settings...
* commit '
9f11f105cd2983021a73b9aa921674fbff3457f3':
Fix issue #
10226007: Reset apps restores most of the changed settings...
Dianne Hackborn [Wed, 7 Aug 2013 23:09:14 +0000 (16:09 -0700)]
am
7f09ec39: Fix issue #
10226007: Reset apps restores most of the changed settings...
* commit '
7f09ec39b6fd7f24751f814649f12ea686cb28d4':
Fix issue #
10226007: Reset apps restores most of the changed settings...
Dianne Hackborn [Wed, 7 Aug 2013 22:36:08 +0000 (15:36 -0700)]
Fix issue #
10226007: Reset apps restores most of the changed settings...
...to original but not all modified ones
Very stupid mistakes in messing up the iteration when pruning op
entries.
Change-Id: Ie536b9095f797fcd2b86c9a386a72746796430d1
Wink Saville [Wed, 7 Aug 2013 18:02:57 +0000 (11:02 -0700)]
Check that hipri has started.
I needed to test the result of startUsingNetworkFeature, otherwise
on mobile networks that are slow to come up, we won't detect
warm SIMs after booting.
Bug:
9962943
Change-Id: Ib638a4e43867ecaa85d6abff65643b77a63526b6
Joe Malin [Wed, 7 Aug 2013 17:47:59 +0000 (10:47 -0700)]
Joe Malin [Wed, 7 Aug 2013 17:44:45 +0000 (10:44 -0700)]
Joe Malin [Wed, 7 Aug 2013 16:53:09 +0000 (09:53 -0700)]
DOC CHANGE: Fixed bug
10210178
Change-Id: If6e955ea287e66df20a441ab44e7bd4557645348
The Android Open Source Project [Wed, 7 Aug 2013 16:43:07 +0000 (09:43 -0700)]
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
Change-Id: I9936340ef1544aad7b8115dc37e3fb9094ed0e2d
Marco Nelissen [Wed, 7 Aug 2013 15:44:43 +0000 (08:44 -0700)]
am
f5cfe708: am
e8acd367: Merge "When deleting a db file, Context.deleteDatabase() has to be called instead of File.delete() to guarantee all db related files like journal, wal, shm, etc are deleted together."
* commit '
f5cfe708a61ecbd89c9db6e09c185ccb3ab87a4a':
When deleting a db file, Context.deleteDatabase() has to be called instead of File.delete() to guarantee all db related files like journal, wal, shm, etc are deleted together.
Marco Nelissen [Wed, 7 Aug 2013 15:42:54 +0000 (08:42 -0700)]
am
e8acd367: Merge "When deleting a db file, Context.deleteDatabase() has to be called instead of File.delete() to guarantee all db related files like journal, wal, shm, etc are deleted together."
* commit '
e8acd367acb82bd80deed31467adcdd9ab83248b':
When deleting a db file, Context.deleteDatabase() has to be called instead of File.delete() to guarantee all db related files like journal, wal, shm, etc are deleted together.
Marco Nelissen [Wed, 7 Aug 2013 15:39:39 +0000 (15:39 +0000)]
Merge "When deleting a db file, Context.deleteDatabase() has to be called instead of File.delete() to guarantee all db related files like journal, wal, shm, etc are deleted together."
Marco Nelissen [Wed, 7 Aug 2013 15:38:12 +0000 (08:38 -0700)]
am
7ffbcb28: am
ca5d99ac: Merge "Guarantee that all db related files are deleted together."
* commit '
7ffbcb2892e66059ec0cce26b4d6054c7778c711':
Guarantee that all db related files are deleted together.
Marco Nelissen [Wed, 7 Aug 2013 15:34:17 +0000 (08:34 -0700)]
am
ca5d99ac: Merge "Guarantee that all db related files are deleted together."
* commit '
ca5d99ac41f00c282b9101d9b84da0338f15798e':
Guarantee that all db related files are deleted together.
Marco Nelissen [Wed, 7 Aug 2013 15:30:51 +0000 (15:30 +0000)]
Merge "Guarantee that all db related files are deleted together."
Dianne Hackborn [Sat, 3 Aug 2013 01:10:10 +0000 (18:10 -0700)]
Add new app ops method to reset all op modes.
Change-Id: I5ee6764de8dc31d812e5a788914ab0099bbef4c0
jangwon.lee [Wed, 7 Aug 2013 00:50:43 +0000 (09:50 +0900)]
Guarantee that all db related files are deleted together.
When deleting a db file, all db related files has to be deleted together
like journal, wal, shm etc.
Change-Id: I49d4581673d03fe669e9e0eaa2b50f7b9d3c34a4
Signed-off-by: jangwon.lee <jangwon.lee@lge.com>
Scott Main [Tue, 6 Aug 2013 22:35:20 +0000 (15:35 -0700)]
am
bdf85de3: am
7b60431b: update <uses-feature> for OpenGL ES version with 3.0 example and API guide link. bug:
10207619
* commit '
bdf85de3b81586aadce564cf9cad6f4c725a302e':
update <uses-feature> for OpenGL ES version with 3.0 example and API guide link. bug:
10207619
Scott Main [Tue, 6 Aug 2013 22:30:41 +0000 (15:30 -0700)]
am
7b60431b: update <uses-feature> for OpenGL ES version with 3.0 example and API guide link. bug:
10207619
* commit '
7b60431ba0f69e51b25e5bf92379222d8ef8691b':
update <uses-feature> for OpenGL ES version with 3.0 example and API guide link. bug:
10207619
Scott Main [Tue, 6 Aug 2013 20:07:34 +0000 (13:07 -0700)]
update <uses-feature> for OpenGL ES version with 3.0 example and API guide link.
bug:
10207619
Change-Id: Ia94b102f3c1476eb118c212de3246e735ffe57b6
Dirk Dougherty [Tue, 6 Aug 2013 17:48:48 +0000 (10:48 -0700)]
am
1153eb46: am
4e847bd1: Doc change: fix federated urls.
* commit '
1153eb46b3aa0226f6d1eac7a196052bd5d818f0':
Doc change: fix federated urls.
Dirk Dougherty [Tue, 6 Aug 2013 17:46:37 +0000 (10:46 -0700)]
am
4e847bd1: Doc change: fix federated urls.
* commit '
4e847bd1f0c4e09f169603fde129e4433a3fe5bc':
Doc change: fix federated urls.
Dirk Dougherty [Tue, 6 Aug 2013 16:59:51 +0000 (09:59 -0700)]
Doc change: fix federated urls.
Change-Id: I29758362e81361a58d85ff8ec9e19d5c8da8da7d
Dirk Dougherty [Tue, 6 Aug 2013 16:32:56 +0000 (09:32 -0700)]
am
8154d293: am
58c68d77: Merge "Doc change: Updated reference docs for Google Play Services 3.2." into jb-mr2-docs
* commit '
8154d2932a3e4f9800eeff18da640fda7a169ec8':
Doc change: Updated reference docs for Google Play Services 3.2.
Dirk Dougherty [Tue, 6 Aug 2013 16:30:12 +0000 (09:30 -0700)]
am
58c68d77: Merge "Doc change: Updated reference docs for Google Play Services 3.2." into jb-mr2-docs
* commit '
58c68d77596dc81ac6715c8bc7785d1cc430929f':
Doc change: Updated reference docs for Google Play Services 3.2.
Dirk Dougherty [Tue, 6 Aug 2013 07:35:27 +0000 (07:35 +0000)]
Merge "Doc change: Updated reference docs for Google Play Services 3.2." into jb-mr2-docs
Wink Saville [Tue, 6 Aug 2013 00:20:13 +0000 (17:20 -0700)]
am
523db46f: Merge "Set subscription_mode in the database to a default value"
* commit '
523db46f6981a40e12007dbbe629bbdc47f861ba':
Set subscription_mode in the database to a default value
Wink Saville [Tue, 6 Aug 2013 00:10:02 +0000 (00:10 +0000)]
Merge "Set subscription_mode in the database to a default value"
Xia Wang [Mon, 5 Aug 2013 22:58:48 +0000 (15:58 -0700)]
am
ebbcc18e: am
4032217e: Merge "Add option for video playback test to accept media source path." into jb-mr2-dev
* commit '
ebbcc18eaa8a69579fadae484630aa1ba447c031':
Add option for video playback test to accept media source path.
Xia Wang [Mon, 5 Aug 2013 22:54:41 +0000 (15:54 -0700)]
am
4032217e: Merge "Add option for video playback test to accept media source path." into jb-mr2-dev
* commit '
4032217ee939d3b23548e83d9183306d66af6f8f':
Add option for video playback test to accept media source path.
Xia Wang [Mon, 5 Aug 2013 22:51:03 +0000 (22:51 +0000)]
Merge "Add option for video playback test to accept media source path." into jb-mr2-dev
Dianne Hackborn [Sat, 3 Aug 2013 01:10:10 +0000 (18:10 -0700)]
Add new app ops method to reset all op modes.
Change-Id: I5ee6764de8dc31d812e5a788914ab0099bbef4c0
Elliott Hughes [Mon, 5 Aug 2013 18:07:13 +0000 (11:07 -0700)]
am
8a736129: Merge "If graphics wants ASCII lowercasing, it needs to ask for it."
* commit '
8a736129faa9e41b5f33c42bbeae1f68cb42d38f':
If graphics wants ASCII lowercasing, it needs to ask for it.
Elliott Hughes [Mon, 5 Aug 2013 18:01:33 +0000 (18:01 +0000)]
Merge "If graphics wants ASCII lowercasing, it needs to ask for it."
Dianne Hackborn [Sat, 3 Aug 2013 02:32:13 +0000 (19:32 -0700)]
am
373a2f15: am
607b414d: Add new app ops method to reset all op modes.
* commit '
373a2f15667956ff8a00ba59b42972b9c930af92':
Add new app ops method to reset all op modes.
Dianne Hackborn [Sat, 3 Aug 2013 02:30:08 +0000 (19:30 -0700)]
am
607b414d: Add new app ops method to reset all op modes.
* commit '
607b414d0444067e166fa54d8ea37563f2715ea3':
Add new app ops method to reset all op modes.
Dianne Hackborn [Sat, 3 Aug 2013 01:10:10 +0000 (18:10 -0700)]
Add new app ops method to reset all op modes.
Change-Id: I5ee6764de8dc31d812e5a788914ab0099bbef4c0
Jean-Baptiste Queru [Sat, 3 Aug 2013 00:42:02 +0000 (17:42 -0700)]
am
17548b3c: Revert "be more robust with handling unknown sensors"
* commit '
17548b3c70fe4f29d33367a61300f5323f5efe99':
Revert "be more robust with handling unknown sensors"
Jean-Baptiste Queru [Sat, 3 Aug 2013 00:41:59 +0000 (17:41 -0700)]
am
83485dc9: Merge "be more robust with handling unknown sensors"
* commit '
83485dc920cdc4a6f3dd6797623f536c99f08a6c':
be more robust with handling unknown sensors
Elliott Hughes [Sat, 3 Aug 2013 00:41:57 +0000 (17:41 -0700)]
am
60ae2617: Merge "If frameworks wants ASCII casing, it should explicity ask for it."
* commit '
60ae2617b4b304fc3e45a441f87d1765714477ba':
If frameworks wants ASCII casing, it should explicity ask for it.
Elliott Hughes [Sat, 3 Aug 2013 00:41:54 +0000 (17:41 -0700)]
am
32c308a5: Merge "If media wants ASCII lowercasing, it needs to ask for it."
* commit '
32c308a5f2051a62ab2fb3337d00d84e9035eb9a':
If media wants ASCII lowercasing, it needs to ask for it.
Dirk Dougherty [Sat, 3 Aug 2013 00:41:05 +0000 (17:41 -0700)]
am
780795dc: am
b6cb0437: Merge "Doc change: refresh GCM reference docs." into jb-mr2-docs
* commit '
780795dc198c05d5a1a181c58317dc6befec861d':
Doc change: refresh GCM reference docs.
Scott Main [Sat, 3 Aug 2013 00:41:02 +0000 (17:41 -0700)]
am
e0a85960: am
9a0087f2: Merge "docs: OpenGL Training sample code fixes" into jb-mr2-docs
* commit '
e0a8596020a10c1cf6347d89fea862d41629db04':
docs: OpenGL Training sample code fixes
Dirk Dougherty [Sat, 3 Aug 2013 00:38:31 +0000 (17:38 -0700)]
am
b6cb0437: Merge "Doc change: refresh GCM reference docs." into jb-mr2-docs
* commit '
b6cb0437ef0677aa4b58bb76a77dd4fdae8258e0':
Doc change: refresh GCM reference docs.
Scott Main [Sat, 3 Aug 2013 00:38:28 +0000 (17:38 -0700)]
am
9a0087f2: Merge "docs: OpenGL Training sample code fixes" into jb-mr2-docs
* commit '
9a0087f22754de40cd5be2a738600f9642a611cc':
docs: OpenGL Training sample code fixes
Jean-Baptiste Queru [Sat, 3 Aug 2013 00:31:54 +0000 (17:31 -0700)]
Revert "be more robust with handling unknown sensors"
This reverts commit
80ba0a6baec17d5ac5a1e6f9e4b84f7d013d07e6.
Jean-Baptiste Queru [Sat, 3 Aug 2013 00:13:24 +0000 (00:13 +0000)]
Merge "be more robust with handling unknown sensors"
Dirk Dougherty [Fri, 2 Aug 2013 22:49:11 +0000 (22:49 +0000)]
Merge "Doc change: refresh GCM reference docs." into jb-mr2-docs
Scott Main [Fri, 2 Aug 2013 22:27:13 +0000 (22:27 +0000)]
Merge "docs: OpenGL Training sample code fixes" into jb-mr2-docs
Elliott Hughes [Fri, 2 Aug 2013 22:13:07 +0000 (22:13 +0000)]
Merge "If frameworks wants ASCII casing, it should explicity ask for it."
Elliott Hughes [Fri, 2 Aug 2013 17:00:44 +0000 (10:00 -0700)]
If frameworks wants ASCII casing, it should explicity ask for it.
http://elliotth.blogspot.com/2012/01/beware-convenience-methods.html
Bug: https://code.google.com/p/android/issues/detail?id=58359
Change-Id: Iaab02e718a7be7bda22e626dca05d79bfd2a8fc4
Scott Main [Fri, 2 Aug 2013 21:29:09 +0000 (14:29 -0700)]
am
2a666620: am
1f196903: Merge "add note to use "480" instead of "xxhdpi" (this should be temporary)" into jb-mr2-docs
* commit '
2a6666207d0e0b7545cbd1f0a7f6754d5ca1587b':
add note to use "480" instead of "xxhdpi" (this should be temporary)
Scott Main [Fri, 2 Aug 2013 21:27:40 +0000 (14:27 -0700)]
am
1f196903: Merge "add note to use "480" instead of "xxhdpi" (this should be temporary)" into jb-mr2-docs
* commit '
1f19690322523d5a28051c55353735513638ca39':
add note to use "480" instead of "xxhdpi" (this should be temporary)
Scott Main [Fri, 2 Aug 2013 21:23:55 +0000 (21:23 +0000)]
Merge "add note to use "480" instead of "xxhdpi" (this should be temporary)" into jb-mr2-docs
Joe Fernandez [Tue, 2 Oct 2012 18:03:45 +0000 (11:03 -0700)]
docs: OpenGL Training sample code fixes
Change-Id: Ifc757a2cb55781d5c42f9256cb698aa5a3a54bb8
(cherry picked from commit
6da22f88434543e8796e0151f4bb11d74c16e847)
Dave Burke [Fri, 2 Aug 2013 20:25:02 +0000 (20:25 +0000)]
Revert "Add version identifier to app ops."
This reverts commit
483a6bbfc118409b9c46b226cf0aa6afdc4d9159.
Change-Id: I91d6b8b8d1789089bf9764e734f7fe59d03151a2
Mathias Agopian [Wed, 3 Jul 2013 22:38:29 +0000 (15:38 -0700)]
be more robust with handling unknown sensors
- add support for new sensors (post 4.3)
- don't crash when encountering an unknown sensor type
- clean-up
Bug:
9683153
Change-Id: Iecd883e8a7d0297be1bd2bd4f00c5cc3ffcbccfe
Dave Burke [Fri, 2 Aug 2013 20:42:03 +0000 (13:42 -0700)]
am
019f4385: am
7925e7cc: Merge "Revert "Add version identifier to app ops."" into jb-mr2-dev
* commit '
019f4385d17234324db23521149e1f1cb6d7d061':
Revert "Add version identifier to app ops."
Dave Burke [Fri, 2 Aug 2013 20:39:12 +0000 (13:39 -0700)]
am
7925e7cc: Merge "Revert "Add version identifier to app ops."" into jb-mr2-dev
* commit '
7925e7cc089251afb2faceb3e81eea436647c572':
Revert "Add version identifier to app ops."
Dave Burke [Fri, 2 Aug 2013 20:36:28 +0000 (20:36 +0000)]
Merge "Revert "Add version identifier to app ops."" into jb-mr2-dev
Dave Burke [Fri, 2 Aug 2013 20:25:02 +0000 (20:25 +0000)]
Revert "Add version identifier to app ops."
This reverts commit
483a6bbfc118409b9c46b226cf0aa6afdc4d9159.
Change-Id: I91d6b8b8d1789089bf9764e734f7fe59d03151a2
Scott Main [Fri, 2 Aug 2013 19:53:50 +0000 (12:53 -0700)]
add note to use "480" instead of "xxhdpi" (this should be temporary)
Change-Id: I6552f1cc420d3278f363df8e0640d59eba1fd180
Elliott Hughes [Fri, 2 Aug 2013 17:24:41 +0000 (17:24 +0000)]
Merge "If media wants ASCII lowercasing, it needs to ask for it."
Elliott Hughes [Fri, 2 Aug 2013 16:30:06 +0000 (09:30 -0700)]
If media wants ASCII lowercasing, it needs to ask for it.
http://elliotth.blogspot.com/2012/01/beware-convenience-methods.html
Use toLowerCase(Locale.ROOT) if you want ASCII for machine consumption,
and use toLowerCase(Locale.getDefault()) if you want the user's locale's
casing rules for human consumption.
Bug: https://code.google.com/p/android/issues/detail?id=58359
Change-Id: Id9005a17e34217a81bef3b40031b9e2e6272f45d
Elliott Hughes [Fri, 2 Aug 2013 16:46:04 +0000 (09:46 -0700)]
am
20c911ba: Merge "When wifi wants ASCII lowercasing, it needs to ask for it."
* commit '
20c911ba071957ff5907d9a7854e7eab1cdaf907':
When wifi wants ASCII lowercasing, it needs to ask for it.
Elliott Hughes [Fri, 2 Aug 2013 16:39:59 +0000 (16:39 +0000)]
Merge "When wifi wants ASCII lowercasing, it needs to ask for it."
Elliott Hughes [Fri, 2 Aug 2013 16:31:11 +0000 (09:31 -0700)]
If graphics wants ASCII lowercasing, it needs to ask for it.
http://elliotth.blogspot.com/2012/01/beware-convenience-methods.html
Bug: https://code.google.com/p/android/issues/detail?id=58359
Change-Id: I13c106985302335dbb15bb9176d35ec6b4546d4e
Elliott Hughes [Fri, 2 Aug 2013 16:07:54 +0000 (09:07 -0700)]
When wifi wants ASCII lowercasing, it needs to ask for it.
http://elliotth.blogspot.com/2012/01/beware-convenience-methods.html
Bug: https://code.google.com/p/android/issues/detail?id=58359
Change-Id: Ibf25d0bbc76015cf8353ec01ab2b743cbc2bde67
Naveen Kalla [Wed, 3 Jul 2013 23:39:27 +0000 (16:39 -0700)]
Set subscription_mode in the database to a default value
If ro.telephony.default_cdma_sub is set, use that to set the
default CDMA subscription source in the database. If that is not set
use the default preferred value defined in the source code.
Change-Id: I11fff596a5fe721c64f192c889672326517dc43d
Dirk Dougherty [Thu, 1 Aug 2013 22:54:07 +0000 (15:54 -0700)]
Doc change: refresh GCM reference docs.
Change-Id: I4f79e27b9d761cb8967fb90ff8df5438e43cd39c
Scott Main [Thu, 1 Aug 2013 22:58:53 +0000 (15:58 -0700)]
am
9210aea5: am
218120e0: Merge "dashboard update for 8/1" into jb-mr2-docs
* commit '
9210aea5accb872527ba1d54ba0760340ad8f1ba':
dashboard update for 8/1
Scott Main [Thu, 1 Aug 2013 22:57:08 +0000 (15:57 -0700)]
am
218120e0: Merge "dashboard update for 8/1" into jb-mr2-docs
* commit '
218120e0795bc4aee1b29a43da25a8ea7e8edf71':
dashboard update for 8/1
Scott Main [Thu, 1 Aug 2013 22:54:05 +0000 (22:54 +0000)]
Merge "dashboard update for 8/1" into jb-mr2-docs
Scott Main [Thu, 1 Aug 2013 22:23:19 +0000 (15:23 -0700)]
dashboard update for 8/1
Change-Id: I8541646e13d20186f79dd8a548b1ff21602793b6
Scott Main [Thu, 1 Aug 2013 22:42:54 +0000 (15:42 -0700)]
am
f5ad5b26: am
8709fb2a: Merge "update Getting Started class about fragments to remove support lib lesson and mention the action bar library, then update any links and add redirect bug:
10000221" into jb-mr2-docs
* commit '
f5ad5b2635d0a46c9a3e09543431a73e915ba4c6':
update Getting Started class about fragments to remove support lib lesson and mention the action bar library, then update any links and add redirect bug:
10000221
Scott Main [Thu, 1 Aug 2013 22:39:19 +0000 (15:39 -0700)]
am
8709fb2a: Merge "update Getting Started class about fragments to remove support lib lesson and mention the action bar library, then update any links and add redirect bug:
10000221" into jb-mr2-docs
* commit '
8709fb2a7175faa3b53cec7869f4b7594371b882':
update Getting Started class about fragments to remove support lib lesson and mention the action bar library, then update any links and add redirect bug:
10000221
Scott Main [Thu, 1 Aug 2013 22:36:03 +0000 (22:36 +0000)]
Merge "update Getting Started class about fragments to remove support lib lesson and mention the action bar library, then update any links and add redirect bug:
10000221" into jb-mr2-docs
Dirk Dougherty [Thu, 1 Aug 2013 22:30:06 +0000 (15:30 -0700)]
Doc change: Updated reference docs for Google Play Services 3.2.
Change-Id: I784e7a16b92f1d122211024fbdb261c06b804376
Scott Main [Thu, 1 Aug 2013 22:25:55 +0000 (15:25 -0700)]
Scott Main [Thu, 1 Aug 2013 22:22:28 +0000 (15:22 -0700)]
Scott Main [Thu, 1 Aug 2013 22:20:24 +0000 (15:20 -0700)]
am
3db57cf1: am
c4c7463f: add note about VideoView "wrap_content" layout issue bug:
9364101
* commit '
3db57cf19d59d1ed39d531137f6fd698befbb348':
add note about VideoView "wrap_content" layout issue bug:
9364101
Scott Main [Thu, 1 Aug 2013 22:14:52 +0000 (15:14 -0700)]
am
c4c7463f: add note about VideoView "wrap_content" layout issue bug:
9364101
* commit '
c4c7463f546ffb2eec7985c0a3d0203cbb8381bb':
add note about VideoView "wrap_content" layout issue bug:
9364101
Scott Main [Thu, 1 Aug 2013 22:13:06 +0000 (15:13 -0700)]
fix toc link
Change-Id: If2509e23db7f4f189f7521846598424cff2c2882
Scott Main [Thu, 1 Aug 2013 22:03:36 +0000 (15:03 -0700)]
am
fba14236: am
4633a50b: Merge "new class on using action bar for training basics" into jb-mr2-docs
* commit '
fba1423687f24063e87439b0ae26a12882bb4780':
new class on using action bar for training basics
Scott Main [Thu, 1 Aug 2013 17:54:16 +0000 (10:54 -0700)]
add note about VideoView "wrap_content" layout issue
bug:
9364101
Change-Id: I21881b30f338e9cdd7ffaa509edcf71e9478ded5
Scott Main [Thu, 1 Aug 2013 22:01:13 +0000 (15:01 -0700)]
am
4633a50b: Merge "new class on using action bar for training basics" into jb-mr2-docs
* commit '
4633a50b6ddf630543e7778e00e084106e503c38':
new class on using action bar for training basics
Scott Main [Thu, 1 Aug 2013 21:58:57 +0000 (21:58 +0000)]
Merge "new class on using action bar for training basics" into jb-mr2-docs
Scott Main [Sat, 20 Jul 2013 02:04:45 +0000 (19:04 -0700)]
new class on using action bar for training basics
Change-Id: I478a9fb7989a961ebefeee55dc67e9a59c054bb0
Dirk Dougherty [Thu, 1 Aug 2013 21:48:54 +0000 (14:48 -0700)]
am
31bd3350: am
f518398e: Merge "Doc Update: Delete this unpublished cruft." into jb-mr2-docs
* commit '
31bd33507bea5c4c2f3f8c6bf30bfb01daa998fd':
Doc Update: Delete this unpublished cruft.
Dirk Dougherty [Thu, 1 Aug 2013 21:45:28 +0000 (14:45 -0700)]
am
f518398e: Merge "Doc Update: Delete this unpublished cruft." into jb-mr2-docs
* commit '
f518398e4c0838c85a7ce988f8ce17b6a8238ffa':
Doc Update: Delete this unpublished cruft.
Dirk Dougherty [Thu, 1 Aug 2013 21:41:29 +0000 (21:41 +0000)]
Merge "Doc Update: Delete this unpublished cruft." into jb-mr2-docs
Sascha Prueter [Thu, 1 Aug 2013 20:55:43 +0000 (13:55 -0700)]
am
aa268f8f: am
d364859c: Merge "Add version identifier to app ops." into jb-mr2-dev
* commit '
aa268f8fb2855335fc0d4f181cbf91505448e5eb':
Add version identifier to app ops.
Sascha Prueter [Thu, 1 Aug 2013 20:52:55 +0000 (13:52 -0700)]
am
d364859c: Merge "Add version identifier to app ops." into jb-mr2-dev
* commit '
d364859ce657c6b096cadc703485ccef7979c582':
Add version identifier to app ops.
Dianne Hackborn [Thu, 1 Aug 2013 18:09:27 +0000 (11:09 -0700)]
Add version identifier to app ops.
All old versions drop their modes except for the notification op
(which is the only one there is currently a user-visible control for).
Change-Id: I9e09cebe63e9ea81f2adc01aef7d1a5a59f57a56