summaryrefslogtreecommitdiffstats
path: root/docs
Commit message (Expand)AuthorAgeFilesLines
* resolved conflicts for merge of 872a1e79 to masterDianne Hackborn2011-06-161-0/+20
|\
| * SDK only: integrate new sample code, deprecating along the way.Dianne Hackborn2011-06-161-0/+20
* | am 2ecb884f: am b481a600: am c7731e07: Merge "cherrypick from hc mr1 Change-I...Robert Ly2011-06-141-9/+9
|\ \ | |/
| * Merge "cherrypick from hc mr1 Change-Id: I2d17c5ea710964b0fe57e6adea4383f30d7...Robert Ly2011-06-141-9/+9
| |\
| | * cherrypick from hc mr1 Change-Id: I2d17c5ea710964b0fe57e6adea4383f30d74bf7dRobert Ly2011-06-141-9/+9
* | | am 8a8f82bb: am 4963cd0b: am 1a3e7cf2: Merge "cherry pick from hc mr1 Change-...Robert Ly2011-06-141-35/+35
|\ \ \ | |/ /
| * | Merge "cherry pick from hc mr1 Change-Id: I6f48d245e2837226096fe42d08fb0243e4...Robert Ly2011-06-141-35/+35
| |\ \
| | * | cherry pick from hc mr1 Change-Id: I6f48d245e2837226096fe42d08fb0243e416dbbcRobert Ly2011-06-091-35/+35
| | |/
* | | am 5e69c0f5: am 1dbb7075: am 8467cd7f: Merge "cherrypick from hc mr1 Change-I...Robert Ly2011-06-142-3/+86
|\ \ \ | |/ /
| * | Merge "cherrypick from hc mr1 Change-Id: I0685106aba681a429ce92c0ec1a4fab592d...Robert Ly2011-06-142-3/+86
| |\ \
| | * | cherrypick from hc mr1 Change-Id: I0685106aba681a429ce92c0ec1a4fab592d186acRobert Ly2011-06-142-3/+86
| | |/
* | | am f3c9a251: am 17cddaf2: am 409b9a4c: Merge "Revert "cherrypick from hc mr1 ...Robert Ly2011-06-141-20/+3
|\ \ \ | |/ /
| * | Merge "Revert "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b859...Robert Ly2011-06-141-20/+3
| |\ \
| | * | Revert "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf9...Robert Ly2011-06-141-20/+3
* | | | am 2aeafe0b: am b5c31b8a: am 194f4745: Merge "Revert "cherrypick from hc mr1 ...Robert Ly2011-06-141-2/+1
|\ \ \ \ | |/ / /
| * | | Merge "Revert "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34b...Robert Ly2011-06-141-2/+1
| |\ \ \
| | * | | Revert "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4e...Robert Ly2011-06-141-2/+1
* | | | | resolved conflicts for merge of 398d021b to masterRobert Ly2011-06-146-719/+1324
|\ \ \ \ \ | |/ / / /
| * | | | Merge "cherrypick from hc mr1 Change-Id: I106cddd6e22d72c48edeaadbf296b045381...Robert Ly2011-06-146-719/+1324
| |\ \ \ \
| | * | | | cherrypick from hc mr1 Change-Id: I106cddd6e22d72c48edeaadbf296b0453813d06aRobert Ly2011-06-146-719/+1324
| | | |_|/ | | |/| |
* | | | | am 0b7d7f53: am b658dfb8: am cbd31aec: Merge "cherry pick from hc mr1 Change-...Robert Ly2011-06-142-129/+347
|\ \ \ \ \ | |/ / / /
| * | | | Merge "cherry pick from hc mr1 Change-Id: Icd86c888b061e7b6770363443fea490c49...Robert Ly2011-06-142-129/+347
| |\ \ \ \
| | * | | | cherry pick from hc mr1 Change-Id: Icd86c888b061e7b6770363443fea490c49b7739eRobert Ly2011-06-092-129/+347
| | |/ / /
* | | | | am ae6dc0c5: am cbfab050: am a91d6552: Merge "cherrypick from hc mr1 Change-I...Robert Ly2011-06-141-1/+2
|\ \ \ \ \ | |/ / / /
| * | | | Merge "cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb...Robert Ly2011-06-141-1/+2
| |\ \ \ \ | | | |/ / | | |/| / | | |_|/ | |/| |
| | * | cherrypick from hc mr1 Change-Id: I507c9b98289b873cb5c40e0e34be433e4eb0d4cbRobert Ly2011-06-141-1/+2
| | |/
* | | am ff46480e: am 4cd4c820: am 9fa54704: Merge "cherrypick from hc mr1 Change-I...Robert Ly2011-06-141-3/+20
|\ \ \ | |/ /
| * | cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7Robert Ly2011-06-141-3/+20
* | | am 8a73d211: am 74c48f2b: am 700a1f25: Merge "Update resources documentation ...Dianne Hackborn2011-06-141-40/+80
|\ \ \ | |/ /
| * | Update resources documentation with new qualifiers.Dianne Hackborn2011-06-131-40/+80
| |/
* | Merge "Fixed typo. "a a" -> "a""Frank Sposaro2011-06-071-1/+1
|\ \
| * | Fixed typo. "a a" -> "a"Frank Sposaro2011-06-061-1/+1
* | | am 16475a3a: am 07613835: am e7d60078: Add old blog posts as articles, batch 1Roman Nurik2011-06-037-0/+313
|\ \ \ | | |/ | |/|
| * | Add old blog posts as articles, batch 1Roman Nurik2011-06-037-1/+314
* | | am b9040e77: am 5b8342cf: am a8629089: Merge "cherrypick Change-Id: I7a3612a1...Scott Main2011-06-032-13/+42
|\ \ \ | |/ /
| * | Merge "cherrypick Change-Id: I7a3612a1bc22cf53d382f787fa43fe222978d35e docs: ...Scott Main2011-06-022-13/+42
| |\ \
| | * | cherrypick Change-Id: I7a3612a1bc22cf53d382f787fa43fe222978d35eScott Main2011-06-022-13/+42
* | | | am 59a3ad16: am d5335253: am b8236751: Merge "cherry pick Change-Id: Id082021...Scott Main2011-06-032-6/+139
|\ \ \ \ | |/ / /
| * | | Merge "cherry pick Change-Id: Id082021be2c27476f106285d0dd68d9e0f5bb514 docs:...Scott Main2011-06-022-6/+139
| |\ \ \
| | * | | cherry pick Change-Id: Id082021be2c27476f106285d0dd68d9e0f5bb514Scott Main2011-06-022-6/+139
| | |/ /
* | | | am 7c8b81c5: am b04ac7ac: am 0d5ed597: Merge "Cherry pick Change-Id: Ie9d6885...Scott Main2011-06-031-2/+2
|\ \ \ \ | |/ / /
| * | | Merge "Cherry pick Change-Id: Ie9d68854926544749dde4edfeac9be2ece38560b docs:...Scott Main2011-06-021-2/+2
| |\ \ \
| | * | | Cherry pick Change-Id: Ie9d68854926544749dde4edfeac9be2ece38560bScott Main2011-06-021-2/+2
| | |/ /
* | | | am 5c6e95a7: am ce214df9: am f58e6c98: Merge "doc typo" into honeycomb-mr2Scott Main2011-06-031-1/+1
|\ \ \ \ | |/ / /
| * | | doc typoScott Main2011-06-011-1/+1
| |/ /
| * | docs: fix typosScott Main2011-06-011-4/+4
* | | am 409db558: am a3d68aed: am d40a5d5c: Cherry pick honeycomb-mr1 I064d4dba to...Joe Malin2011-06-031-1/+20
|\ \ \ | |/ /
| * | Cherry pick honeycomb-mr1 I064d4dba to I48ddc26d4fJoe Malin2011-05-311-1/+20
* | | am 092b0bd9: am de43d71b: am f128d5d4: Merge "docs: adjust what\'s visible fo...Scott Main2011-06-022-9/+18
|\ \ \ | |/ /
| * | Merge "docs: adjust what's visible for online and offline docs" into honeycom...Scott Main2011-05-272-9/+18
| |\ \
generated by cgit v1.1 at 2024-09-18 01:48:58 +0000