Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
279,828 Commits 3 Branches 0 Tags
bb15b50ffc02e02de0af11e2bee577fc47a44e2e
Commit Graph

5 Commits

Author SHA1 Message Date
Trevor Johns
682c24e228 Resolve merge conflicts of a5060ee to nyc-dev 
This undoes the automerger skip which occured in
commit e740c84dc3 and
replays it as a standard (NOT -s ours) merge.

Change-Id: If5a47be26f73d6a0735c425cd66310a3e2a89086
 2016-04-19 02:03:59 -07:00
Robert Schaub
71647af1ee am cf05e318: am 2a1be1bc: Docs: Added declaration to code fragment Bug: 21030774 
* commit 'cf05e31866e94eb9d8a6f0ee1fb9960ba169e2c1':
  Docs: Added declaration to code fragment Bug: 21030774
 2015-06-26 22:58:37 +00:00
Robert Schaub
2a1be1bc38 Docs: Added declaration to code fragment 
Bug: 21030774

Change-Id: Ic906454b20ec9606e5ca11a0fbd0388492eecf42
 2015-06-26 11:11:19 -07:00
Narayan Kamath
56eb989791 Remove references to apache-http from various documents. 
Most of them are pointless links to a "text/plain" constant which are
far clearer when inlined with the relevant text.

Change-Id: Iaed51b4548cb2836741106dc19c9cf500c205d32
 2014-12-12 14:55:18 +00:00
Katie McCormick
1a89ae4cdc Doc update: new Volley class 
Change-Id: Ife3a9a64439e07aaaf92a22adc6d1678138caf7d
 2014-05-29 16:38:34 -07:00