drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
95,328 Commits 1 Branch 0 Tags
Commit Graph

4208 Commits

Author SHA1 Message Date
Scott Main
4147f86699 am 69a98134: am 2da55bd9: am b4d42b02: am 6f6b20d9: Merge "fix rounding errors in dashboard data" into jb-mr1.1-docs 
* commit '69a981342c620b829a4fe09c767a3eb50fbd2464':
  fix rounding errors in dashboard data
 2013-03-07 11:49:34 -08:00
Scott Main
baea90ddf5 am 77560a3d: am 08664441: am 4ce887bd: am 3378c90a: Merge "update google io banner graphic" into jb-mr1.1-docs 
* commit '77560a3d6e9b37c16f346b98bbe618834a24d6a2':
  update google io banner graphic
 2013-03-07 11:49:31 -08:00
Trevor Johns
c19b866158 am ef631700: am b02ca5ef: am 0c9f413b: am 58a54cb3: [docs] Fix issue #8288695: Typo in OAuth2 training 
* commit 'ef631700eb26a47820eeab2b2450dcfb4213af5c':
  [docs] Fix issue #8288695: Typo in OAuth2 training
 2013-03-07 11:49:26 -08:00
Scott Main
b4d42b0247 am 6f6b20d9: Merge "fix rounding errors in dashboard data" into jb-mr1.1-docs 
* commit '6f6b20d9675711ef5ff7e776bc5542688d77d144':
  fix rounding errors in dashboard data
 2013-03-07 08:55:50 -08:00
Scott Main
6f6b20d967 Merge "fix rounding errors in dashboard data" into jb-mr1.1-docs 2013-03-07 16:52:14 +00:00
Scott Main
4ce887bdca am 3378c90a: Merge "update google io banner graphic" into jb-mr1.1-docs 
* commit '3378c90a09079af9f3f3bd8f9176413aa8644f48':
  update google io banner graphic
 2013-03-07 08:50:23 -08:00
Scott Main
3378c90a09 Merge "update google io banner graphic" into jb-mr1.1-docs 2013-03-07 16:46:38 +00:00
Scott Main
9b0d5dcd7a fix rounding errors in dashboard data 
Change-Id: Ifc65072e95f2bf761fd947231c8512d432f55e24
 2013-03-07 08:26:57 -08:00
Scott Main
7c063b2f42 update google io banner graphic 
Change-Id: I20e2b8472f384b4e60d64c412ec226dc1b2aaa44
 2013-03-06 19:44:27 -08:00
Trevor Johns
34418be010 am 58a54cb3: [docs] Fix issue #8288695: Typo in OAuth2 training 
* commit '58a54cb3805e219b2d0a76cd8b9df9b33e41e0d0':
  [docs] Fix issue #8288695: Typo in OAuth2 training
 2013-03-06 17:03:02 -08:00
Trevor Johns
0c9f413b89 am 58a54cb3: [docs] Fix issue #8288695: Typo in OAuth2 training 
* commit '58a54cb3805e219b2d0a76cd8b9df9b33e41e0d0':
  [docs] Fix issue #8288695: Typo in OAuth2 training
 2013-03-06 17:02:55 -08:00
Trevor Johns
58a54cb380 [docs] Fix issue #8288695: Typo in OAuth2 training 
There's a typo in the "Authenticating to OAuth2 Services" training
class, under "Request an Auth Token... Again" (#RequestAgain).

The call to result.get() will fail, because AccountManagerFuture
doesn't support this method. Instead, getResult() needs to be
called first.

Change-Id: Ia25b9364cd14180cf7ddac50057a2ec03e01ed1f
 2013-03-06 14:46:47 -08:00
Scott Main
ef3bea6cd8 am 4be483da: am f37669ff: am d6e8a00b: am 23513a2c: docs: update country filtering description bug: 8278024 
* commit '4be483dac8eb1024ad9298d582ad2a7068cf5822':
  docs: update country filtering description bug: 8278024
 2013-03-05 15:11:53 -08:00
Scott Main
9ea1bacadd am 23513a2c: docs: update country filtering description bug: 8278024 
* commit '23513a2c856c1810e10425bcec4296df2be01584':
  docs: update country filtering description bug: 8278024
 2013-03-05 15:04:01 -08:00
Scott Main
d6e8a00b0b am 23513a2c: docs: update country filtering description bug: 8278024 
* commit '23513a2c856c1810e10425bcec4296df2be01584':
  docs: update country filtering description bug: 8278024
 2013-03-05 15:03:53 -08:00
quddusc
56b9ccaf40 am 9956455a: am 21637c0f: am ea22f73a: am d5bf7fbd: Merge "docs: Fixed onDestroy() code snippet in IABv3 training class. Bug: 8289494" into jb-mr1.1-docs 
* commit '9956455a6f2bb62421659287e267e69484a51612':
  docs: Fixed onDestroy() code snippet in IABv3 training class. Bug: 8289494
 2013-03-05 14:18:14 -08:00
quddusc
ea22f73a5e am d5bf7fbd: Merge "docs: Fixed onDestroy() code snippet in IABv3 training class. Bug: 8289494" into jb-mr1.1-docs 
* commit 'd5bf7fbd7accd00fca25b9f4ad3789ab064b38a8':
  docs: Fixed onDestroy() code snippet in IABv3 training class. Bug: 8289494
 2013-03-05 14:12:02 -08:00
quddusc
d5bf7fbd7a Merge "docs: Fixed onDestroy() code snippet in IABv3 training class. Bug: 8289494" into jb-mr1.1-docs 2013-03-05 22:09:39 +00:00
quddusc
2a1ac70579 am e772ce34: am 3a3290e3: am 096c7f7b: am f353c9ed: Merge "docs: Fix IABv3 AIDL installation instructions for Eclipse users. Bug: 8282080" into jb-mr1.1-docs 
* commit 'e772ce348ce99bc3edbfec186ff416cb2735113f':
  docs: Fix IABv3 AIDL installation instructions for Eclipse users. Bug: 8282080
 2013-03-05 13:13:45 -08:00
quddusc
096c7f7b64 am f353c9ed: Merge "docs: Fix IABv3 AIDL installation instructions for Eclipse users. Bug: 8282080" into jb-mr1.1-docs 
* commit 'f353c9ed7d0eb59c0663639f2800c5c4e542386c':
  docs: Fix IABv3 AIDL installation instructions for Eclipse users. Bug: 8282080
 2013-03-05 13:03:22 -08:00
Scott Main
23513a2c85 docs: update country filtering description 
bug: 8278024

Change-Id: Ia401ed1c2e7ce12052db217265a1a420c44ffe78
 2013-03-05 12:19:10 -08:00
Scott Main
0f8958d053 am e3b8a46c: am f4c80adc: am 48ff42cd: am 864e60fb: Merge "cherrypick from Change-Id: I6615e7036dce48e46f6a2b284046219d8237de5f dashboard update for 4/4/13" into jb-mr1-dev 
* commit 'e3b8a46c4c37bf72086697c5add976297e329190':
  cherrypick from Change-Id: I6615e7036dce48e46f6a2b284046219d8237de5f dashboard update for 4/4/13
 2013-03-05 11:49:21 -08:00
Joe Malin
d88cccc9ba am 72ee1820: am c1767371: am ebdf1ccc: am 33a9f63c: Merge "Bug 8289268: Reversed text Content Provider Basics" into jb-mr1-dev 
* commit '72ee1820ceb5595087baca1c1205f5140197e0cb':
  Bug 8289268: Reversed text Content Provider Basics
 2013-03-05 11:45:51 -08:00
Scott Main
48ff42cd1c am 864e60fb: Merge "cherrypick from Change-Id: I6615e7036dce48e46f6a2b284046219d8237de5f dashboard update for 4/4/13" into jb-mr1-dev 
* commit '864e60fb26ddb7c48d0f0b9a0519e40b2fd528f0':
  cherrypick from Change-Id: I6615e7036dce48e46f6a2b284046219d8237de5f dashboard update for 4/4/13
 2013-03-05 11:43:49 -08:00
Joe Malin
ebdf1ccc5b am 33a9f63c: Merge "Bug 8289268: Reversed text Content Provider Basics" into jb-mr1-dev 
* commit '33a9f63c1c81e44d09b2b509c04db5218ed64c0f':
  Bug 8289268: Reversed text Content Provider Basics
 2013-03-05 11:40:15 -08:00
Scott Main
864e60fb26 Merge "cherrypick from Change-Id: I6615e7036dce48e46f6a2b284046219d8237de5f dashboard update for 4/4/13" into jb-mr1-dev 2013-03-05 19:39:38 +00:00
Joe Malin
91dad7e8a3 am 33a9f63c: Merge "Bug 8289268: Reversed text Content Provider Basics" into jb-mr1-dev 
* commit '33a9f63c1c81e44d09b2b509c04db5218ed64c0f':
  Bug 8289268: Reversed text Content Provider Basics
 2013-03-05 11:38:37 -08:00
Joe Malin
33a9f63c1c Merge "Bug 8289268: Reversed text Content Provider Basics" into jb-mr1-dev 2013-03-05 19:35:57 +00:00
Scott Main
6e140b6b86 cherrypick from Change-Id: I6615e7036dce48e46f6a2b284046219d8237de5f 
dashboard update for 4/4/13

Change-Id: I04903c2c7ef56f6bef39a9e01fcce386d26e4763
 2013-03-05 11:35:49 -08:00
Scott Main
0793c6e84f dashboard update for 4/4/13 
Change-Id: I6615e7036dce48e46f6a2b284046219d8237de5f
 2013-03-04 16:18:27 -08:00
Scott Main
44e087bdba am a3279494: am 8d5b8846: am 16bdd13e: am 00158363: docs: add bdc\'s security doc as training article 
* commit 'a3279494a451bac0c906d518a2c5a51934727db9':
  docs: add bdc's security doc as training article
 2013-03-01 11:11:52 -08:00
Scott Main
10dda9ca64 am 00158363: docs: add bdc\'s security doc as training article 
* commit '00158363b47d916d159d2f3a0e1152783fd66a9c':
  docs: add bdc's security doc as training article
 2013-03-01 11:05:12 -08:00
Scott Main
16bdd13ec7 am 00158363: docs: add bdc\'s security doc as training article 
* commit '00158363b47d916d159d2f3a0e1152783fd66a9c':
  docs: add bdc's security doc as training article
 2013-03-01 11:04:27 -08:00
Scott Main
00158363b4 docs: add bdc's security doc as training article 
Change-Id: Iaee006f5e93356cc7cda8e5bff7fc03642329e46
 2013-03-01 09:49:41 -08:00
quddusc
ce7411f325 docs: Fixed onDestroy() code snippet in IABv3 training class. 
Bug: 8289494

Change-Id: I6f9dcd9e50ec8b03e8df415b6f7cee3221275c57
 2013-02-28 16:16:34 -08:00
Joe Malin
5d64aa2ac3 Bug 8289268: Reversed text Content Provider Basics 
Change-Id: I4eab50651d47bb86709740595d982d9524a561fb
 2013-02-28 09:18:24 -08:00
Dirk Dougherty
08a551b4ad am f132ac4f: am ac6a76d2: am f19dd2b5: am 1c7b442a: Merge "Doc change: update \'multiple apks\' criteria in filters doc." into jb-mr1-dev 
* commit 'f132ac4fb4b0ca6cf3b8aaeea469a46a286435c7':
  Doc change: update 'multiple apks' criteria in filters doc.
 2013-02-27 19:00:16 -08:00
Dirk Dougherty
f80cb1869e am 1c7b442a: Merge "Doc change: update \'multiple apks\' criteria in filters doc." into jb-mr1-dev 
* commit '1c7b442aae47d34176f832a1c45393b9f7e42631':
  Doc change: update 'multiple apks' criteria in filters doc.
 2013-02-28 02:54:51 +00:00
Dirk Dougherty
f19dd2b50e am 1c7b442a: Merge "Doc change: update \'multiple apks\' criteria in filters doc." into jb-mr1-dev 
* commit '1c7b442aae47d34176f832a1c45393b9f7e42631':
  Doc change: update 'multiple apks' criteria in filters doc.
 2013-02-27 18:54:18 -08:00
Dirk Dougherty
1c7b442aae Merge "Doc change: update 'multiple apks' criteria in filters doc." into jb-mr1-dev 2013-02-28 02:51:16 +00:00
Dirk Dougherty
c511675bcb Doc change: update 'multiple apks' criteria in filters doc. 
Change-Id: I8504f5e019758946d567d4391c1a875dead236c5
Bug: 8277558
 2013-02-28 02:50:11 +00:00
Scott Main
38471f9e85 am 49c03cc8: am 65b7d5a4: am dc9e84bd: am d346b311: Merge "docs: add MTK usb driver info" into jb-mr1-dev 
* commit '49c03cc8183f8a128f68ecf777cbe7ce9ac7d021':
  docs: add MTK usb driver info
 2013-02-27 17:35:30 -08:00
Scott Main
9ecd8e7ba1 am d346b311: Merge "docs: add MTK usb driver info" into jb-mr1-dev 
* commit 'd346b311cabbcf4d7d4654984efddd47cdf8a3fc':
  docs: add MTK usb driver info
 2013-02-28 01:25:46 +00:00
Scott Main
dc9e84bdab am d346b311: Merge "docs: add MTK usb driver info" into jb-mr1-dev 
* commit 'd346b311cabbcf4d7d4654984efddd47cdf8a3fc':
  docs: add MTK usb driver info
 2013-02-27 17:25:45 -08:00
Scott Main
d346b311ca Merge "docs: add MTK usb driver info" into jb-mr1-dev 2013-02-28 01:22:58 +00:00
quddusc
f353c9ed7d Merge "docs: Fix IABv3 AIDL installation instructions for Eclipse users. Bug: 8282080" into jb-mr1.1-docs 2013-02-28 00:01:48 +00:00
quddusc
5319f312aa docs: Fix IABv3 AIDL installation instructions for Eclipse users. 
Bug: 8282080

Change-Id: I094a3b4ac7e241009e75bae457f34a0a32accde1
 2013-02-27 15:41:08 -08:00
Dirk Dougherty
99fd8c21ca am 74d4638e: am a44583c1: am 8e4e5549: am d9019dd2: Doc change: Mention ratings in app stats intro, mention proguard in pub checklist, align terminology wrt native platform filtering. 
* commit '74d4638e2821e21885528d79d5b39c0ac08d3740':
  Doc change: Mention ratings in app stats intro, mention proguard in pub checklist, align terminology wrt native platform filtering.
 2013-02-27 14:49:52 -08:00
Dirk Dougherty
8e4e554937 am d9019dd2: Doc change: Mention ratings in app stats intro, mention proguard in pub checklist, align terminology wrt native platform filtering. 
* commit 'd9019dd275f9a0a8be4ac8ae383e2878f78b5445':
  Doc change: Mention ratings in app stats intro, mention proguard in pub checklist, align terminology wrt native platform filtering.
 2013-02-27 14:43:01 -08:00
Dirk Dougherty
d9019dd275 Doc change: Mention ratings in app stats intro, mention proguard in pub checklist, align terminology wrt native platform filtering. 
Change-Id: I9bba5b8ffb7da40083904f6f471e99fd4c98d63d
Bug: 8033688
Bug: 8277558
 2013-02-27 14:34:24 -08:00