Commit Graph

10739 Commits

Author SHA1 Message Date
bohu
f0f43b70aa am 7bf71cfb: Merge "Bump revision number for all system images" into jb-mr1.1-dev
* commit '7bf71cfb0934b1578058242d7a0c3b5f84ca00d3':
  Bump revision number for all system images
2015-02-13 20:22:38 +00:00
bohu
e591d22bb0 am f8ac5e31: back port gles fix to api 17
* commit 'f8ac5e31789bf294f2969c2d08d902042d1a0420':
  back port gles fix to api 17
2015-02-13 20:22:37 +00:00
bohu
7bf71cfb09 Merge "Bump revision number for all system images" into jb-mr1.1-dev 2015-02-13 18:37:07 +00:00
bohu
4c7a7e990d Bump revision number for all system images
We plan to release bug fix version of all system images, bump revision
number by 1.

Change-Id: I265c83cbdf0c67b45a4f48a2139edbe613558c0d
2015-02-12 17:13:16 -08:00
bohu
f8ac5e3178 back port gles fix to api 17
Following CLs are ported:

        717e625415c4398431b84851ba1b76d8c59ae9cf Add shader version to glGetString
        32c30975ea654b9654ad9dade0d25b9856e63f1b Add parameters validation to glShaderSource() API
        b0c7cce25bf9323a359800a86c0c7609db2acea4 Fix eglDestroyContext and glTexImage2D
        2fc65202c214640c55b52c29bbc9213170d0b533 handles glGetBooleanv when value is nonboolean
        beda8027439b9c20475b8a3d379823d09fca3abb Properly initialize GLClientState's m_states
        84684ec571a1db94e32a67cb7d154ab562dd0d7f Unbind buffer when buffer is deleted
        89b7aac84f8babab93ff5326ad492164d971c421 Handle empty data parameter in glTexSubImage2D_enc
        adb0f74f792ba7bca20257b9c0ea41ebda9bb229 Allow glGetProgramInfoLog_enc to have empty length
        b31166704ddb7751619cf0bbc4f2f4575c0ad3c4 Guard against negative buffer size
        641f35af08a0a4c46586a592ff4e703e866d581a Guard against negative width and height
        9d18698dd8da15937f80e5476d73400a011934be Handle empty buffer in QemuPipeStream::writeFully
        40a674e0d0acac87aa25eb9de720dc2fb07d9e4f Fix emulator crashes on glDrawElements command
        7fa2b92de2058a3556e5f38a135de415bb3d5e45 Merge "Use more appropriate type in cb_handle_t::validate."
        fe2c5beb964d2e2aecedb02b9cca592e0811d90b Use more appropriate type in cb_handle_t::validate.
        376688e76694bf5b8672379c540b1bda059da682 Merge "ranchu: Fix goldfish_pipe definitions."
        e3e686593cc8bdaf3ca4f6fa0b33b62a6951d1d6 ranchu: Fix goldfish_pipe definitions.
        7d3d0c99d2c82319e001289d1b9e091e5ff8f7aa Merge "ranchu: Add ARM64-specific root/ramdisk config files."
        d0fead3c53d6e450deb69aad72651e132b6cc072 ranchu: Add ARM64-specific root/ramdisk config files.
        638ee524f83053613c47ddea22c4bf98a0175c2f Merge "Remove display initialization from eglGetProcAddress API"
        7a2929cd6548693b581c17ba69308a49e03c56be Remove display initialization from eglGetProcAddress API
        9b1e6c5a3ccd943b7158dce83387fbfcc1162d69 Merge "Make the size of "cb_handle_t" same for 32/64-bit"
        7ea757df0311bfb7310a7a765dcec1b79f39f25d Merge "goldfish: camera: fix 64-bit warnings"
        3725c7c982eac52ec64a625e82f306822452941c goldfish: camera: fix 64-bit warnings
        eed789f036cbcedf2fa96ae3e273c2234102d340 Merge "goldfish: Fix /cache partition type."
        f55ac4fc027ae3d97f4faaa6ccd65480f493dea7 goldfish: Fix /cache partition type.
        690792a66c7fca6bf0aa17c2d5043ab86d145965 Merge "Revert "Revert "goldfish: cache image is not ext4. yet."""
        8853df9503e0edec6cac0e1e0840fa111d57a79a Revert "Revert "goldfish: cache image is not ext4. yet.""
        d8a6e67044ddcac7c53adbe6b871c33447110905 Merge "Revert "goldfish: cache image is not ext4. yet.""
        5e2caf7883279113d6f5f4777122dc88262c34c6 Revert "goldfish: cache image is not ext4. yet."
        3f62b50d45441ae077c958423e9e301acd5dcc11 Make the size of "cb_handle_t" same for 32/64-bit
        aec15d91ee48797f2b3c3fe61cca977900ebcd47 am 646f0b25: Merge "opengl: rcOpenColorBuffer must be synchronous"
        646f0b25e63164950d1d99b9b8021be74c2321c6 Merge "opengl: rcOpenColorBuffer must be synchronous"
        c542f3d8fc89678574b2fa650395f3dfac991a20 opengl: rcOpenColorBuffer must be synchronous
        6ccaeebd78dcb5e20e2c0e81cdc571fb74f9cfb7 am 2c6c08a2: Merge "Move goldfish from fdprintf to POSIX dprintf."
        2c6c08a23d2f5f760753745be5b67fe5759dcc91 Merge "Move goldfish from fdprintf to POSIX dprintf."
        0228f8a1cdf5b2391201333de73fabab6d2ca72f Move goldfish from fdprintf to POSIX dprintf.
        dbda557d4dcf022850ea4ab4f89e1c154e2aea04 am 5cb5779a: Merge "gralloc: don\'t initialize reserved_proc"
        5cb5779ad0ad75a59bfb8ce42317a4ee18300281 Merge "gralloc: don't initialize reserved_proc"
        e46eea0b5bdef28f5c42e4d7764b030679479354 gralloc: don't initialize reserved_proc
        67334d0b9d0da7595daf07a3e9bea6a55436e296 Merge commit 'd9dc763708823aa865983bb8dc37b5ecc5669620' into HEAD
        7076e4647af737393baf020c13e81a090f4a9f26 Merge "Add 64-bit software GLES/EGL support in gralloc.goldfish module"
        3f92be74c1e9b2314d4c0f8feaacf7bafce7dedc Add 64-bit software GLES/EGL support in gralloc.goldfish module
        61a8f0bbc146a4050a885e1e7c314dfc4ab72779 Merge "Fix the Chrome app crash in emulator issue"
        bd93fee73b02d0b223b441c34a4f8e04eb57291d Merge "Support GLES acceleration in 64bit emulator on device side"
        a1de8e2f5e4c29341be01bae364a54d92d14c742 Fix the Chrome app crash in emulator issue
        4f94a5f8b13a5fdd80988e77dd5d468b958b0117 Merge "Remove the useless folder and files in emulator GLES/EGL drivers"
        31aad5c0a0de056114b6bb843a5c37d8de6e46e4 Remove the useless folder and files in emulator GLES/EGL drivers
        aedc716648071a1403f4ac92a380d1d4a5377052 Support GLES acceleration in 64bit emulator on device side
        d9dc763708823aa865983bb8dc37b5ecc5669620 am aedf829a: Merge "goldfish: cache image is not ext4. yet."
        aedf829a920c3100de5caa49b0dec02d66eed96b Merge "goldfish: cache image is not ext4. yet."
        a2543be45f35ab7ace3ecd92c99a3c72150622ec goldfish: cache image is not ext4. yet.
        9dba558f4621d3d70a05c0a3d8e2c34b3883f866 am 48a76778: Merge "Remove #include <asm/page.h>."
        644f53c8705586705c27b799e5b5f303118e8b3c am 155ca91c: Merge topic \'emu64\'
        48a76778937abadf5cbd260696a29d737134d0d9 Merge "Remove #include <asm/page.h>."
        1daf365476f888a5d9534607c8299a3b5160b4a7 Remove #include <asm/page.h>.
        155ca91c1253bcb85a0eeec93ded6da07122d4ff Merge topic 'emu64'
        324a0c43835b935721c938a2684874e0b5bf8311 Disable echo on all tty lines
        8bb5f92dcd48dbbaa69ab15f97aca13d49b08599 ueventd.goldfish.rc: set system permissions for /dev/goldfish_pipe
        5b31b113176dec8d7fcfb5650f3dd7b01baf605c am 48107fa1: Merge "device/generic/goldfish: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"
        48107fa1dd354f8667b74f335c3f82f472b7d112 Merge "device/generic/goldfish: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"
        5212e4a903d2654572b8bdde0bda3bdd6ecbee6e device/generic/goldfish: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH
        2061519f3e55ba1dac643cac34a4aa6f0f0dfeee am 44c72ca0: Merge "Vibra: Add the vibrator module for goldfish"
        44c72ca0b92c75ffef5e691a24d5d06d6a3e7baa Merge "Vibra: Add the vibrator module for goldfish"
        0f41b57f2aa2ffa8fd90ebd50c13c2dd0249ee0f Vibra: Add the vibrator module for goldfish
        ac534df6c39944a91f157819628db3d6f63b75f1 am 59922432: Merge commit \'f09bc5256e48a44eec9ca47ba838c12d0e89a198\' into HEAD
        59922432be859a46eeb76650b24308505625da36 Merge commit 'f09bc5256e48a44eec9ca47ba838c12d0e89a198' into HEAD
        144d2d5d683928f393a9567c443c8f5af13dfdd0 am b9a62053: Merge commit \'828bd482a1aeacf96d5f3a3e0701029d9f890c5f\' into HEAD
        b9a62053cf74025a43c8baa118d52729e38cc176 Merge commit '828bd482a1aeacf96d5f3a3e0701029d9f890c5f' into HEAD
        a648b35cca58d3d1608e1beb21028f91bd0b9df7 am 2befc3ed: Merge "Modify the build targets for goldfish from to include aosp*."
        2befc3edc583afb43a4f6740f0af0534eac8e9d5 Merge "Modify the build targets for goldfish from to include aosp*."
        bc233492e3ce3af8cc23496ee58cd3dc1b74d0f0 Modify the build targets for goldfish from to include aosp*.
        f09bc5256e48a44eec9ca47ba838c12d0e89a198 am b9a7de1a: Merge "Delete buffer data when removing it from the SharedGroup namespace"
        b9a7de1a690bc638496e0550e6a9ebe859fc0315 Merge "Delete buffer data when removing it from the SharedGroup namespace"
        8562d1b6e089254837da3ab2d272c65c3bb5d8c7 Delete buffer data when removing it from the SharedGroup namespace
        f8b99f123467cd6164d071237f5dbe703f9ea2d7 am 6b151ca8: Merge "Catch divide by zero case in drawCheckerBoard() function."
        6b151ca8833aa7271e311436dad97588b71b7a38 Merge "Catch divide by zero case in drawCheckerBoard() function."
        d7cc5da79d828ec6cb21926be13265fc52715e2f am 84309165: Merge "Drop setting of in_qemu boolean and restorecon /sys/qemu_trace."
        84309165ca52b7446e388c13127fd6e305833f24 Merge "Drop setting of in_qemu boolean and restorecon /sys/qemu_trace."
        46bcb5f7a64ccd440d5a292c7afd2e2b5c2bee4f Drop setting of in_qemu boolean and restorecon /sys/qemu_trace.
        b0b6afb44269263afa080ecc643f2c4866adfb38 Catch divide by zero case in drawCheckerBoard() function.
        828bd482a1aeacf96d5f3a3e0701029d9f890c5f am 2524d396: Update emulator to FUSE-wrap its SD card.
        2524d39681566f4eca7afb7950e05ab642978263 Update emulator to FUSE-wrap its SD card.
        e8122dff1ef2de4d41835265a59d8960e7800fae camera3: Fix stream id types
        3ad13188d4e7e873947040ec22a35d73efb76812 Camera2/3: Implement full-color NV21 output.
        a4c19be9274d8bb993f88a6a1cbd2ad92f4a48fa Merge "Added net.dns1 prop for emulator, as Android emulator ignores it by default."
        ccb835ba267e927f7df759290bd46ac78712a3b2 Merge "Camera2/3: Update static metadata"
        0049ee8925212a3a5ff095a8a66cab184adf8f1b Camera2/3: Update static metadata
        8ff1e5f1e3e24baf311e6263b48f389c206f14ac am 8f9288ea: goldfish: use fstab.goldfish
        8f9288eaf10b50d19038f5c7024616e147c64735 goldfish: use fstab.goldfish
        e96a7c7da79939c509a7517f2b2de37e840a6390 Added net.dns1 prop for emulator, as Android emulator ignores it by default.
        ff3a362fb9aca15285a95cad6baa08e961330e8e am bf34d172: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
        bf34d1722ea1ebdf779837611220b5269bd35968 Reconcile with jb-mr2-zeroday-release - do not merge
        d9fcbd08b0413fedc8219237534ce31d6b7fd2f5 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
        ad9dd4bfdfa9ab6ccfc4be14305b6ed8b9a0ab5a am 2c84e47e: am 07a4c8b4: Camera3: Fix default AE mode
        2c84e47e3d0085b1222de94013c75c0328b02492 am 07a4c8b4: Camera3: Fix default AE mode

Change-Id: I3902e73cf96f9d64d56d939dce2673ad5710f6cb
2015-02-03 17:42:11 -08:00
Deepanshu Gupta
84e3386eb2 am 5fff297a: am e2ee1baf: resolved conflicts for merge of 6458c80c to jb-mr1.1-docs
* commit '5fff297a34f2699a64a055700da4d3411e7c7ca2':
  Update platform SDK component to revision 5. [DO NOT MERGE]
2014-07-18 22:31:29 +00:00
Deepanshu Gupta
5fff297a34 am e2ee1baf: resolved conflicts for merge of 6458c80c to jb-mr1.1-docs
* commit 'e2ee1baff8f1c0275e28ad4ccd5018545933a6e3':
  Update platform SDK component to revision 5. [DO NOT MERGE]
2014-07-18 22:27:07 +00:00
Deepanshu Gupta
e2ee1baff8 resolved conflicts for merge of 6458c80c to jb-mr1.1-docs
Change-Id: I8b4d344b4cf0004b377e0e9b08f3bbaf0a7641f0
2014-07-18 15:17:44 -07:00
Deepanshu Gupta
6458c80c00 resolved conflicts for merge of 3baef70c to jb-mr1-dev
Change-Id: I93a460f4ba7c9e2d8e417c53061072773f9ef9fd
2014-07-18 15:00:58 -07:00
Deepanshu Gupta
3baef70ca5 am 95da2621: Update platform SDK component to revision 5. [DO NOT MERGE]
* commit '95da262195c8cc13c20d4b0bd70c87ae49046cf1':
  Update platform SDK component to revision 5. [DO NOT MERGE]
2014-07-18 21:43:46 +00:00
Deepanshu Gupta
a9078f4a2b am 7ee92e43: Update platform SDK component to revision 3. [DO NOT MERGE]
* commit '7ee92e43446fe4f9c5f30e997afabe443719bca1':
  Update platform SDK component to revision 3. [DO NOT MERGE]
2014-07-18 21:42:35 +00:00
Deepanshu Gupta
95da262195 Update platform SDK component to revision 5. [DO NOT MERGE]
Also update LayoutLib Api version.

Change-Id: Ifa357a964b8ed7c4f84c2162ddfb074e262ca69f
2014-07-09 17:07:22 -07:00
Deepanshu Gupta
7ee92e4344 Update platform SDK component to revision 3. [DO NOT MERGE]
Also update LayoutLib Api version.

Change-Id: Ic64a548d171891100f043c3e1a823db22b11e71e
2014-07-09 16:59:37 -07:00
Deepanshu Gupta
bbfcdcc45a am 36b22516: Package renamed fonts. [DO NOT MERGE]
* commit '36b225169ab4ac6bcd59e685517fdc4bc2e8b420':
  Package renamed fonts. [DO NOT MERGE]
2014-07-08 23:17:24 +00:00
Deepanshu Gupta
36b225169a Package renamed fonts. [DO NOT MERGE]
PS names of fonts are renamed to include the version number. This change
packages the fonts from the output directory of the script that modifies
the fonts.

Change-Id: I023fb0dfcf50698f80e26b7d476969c453fc4cc7
(cherry picked from commit 35feaff496)
2014-06-12 16:16:04 -07:00
Deepanshu Gupta
19e61e5f52 am a5d913ab: Add ICU jar to SDK [DO NOT MERGE]
* commit 'a5d913ab3789e552bdfcc0a2a6b9fb87d6f1b0ca':
  Add ICU jar to SDK [DO NOT MERGE]
2014-05-02 19:08:45 +00:00
Deepanshu Gupta
a5d913ab37 Add ICU jar to SDK [DO NOT MERGE]
Bundle the ICU jar with the SDK.

Change-Id: I0773cee58b072f3bf60c2594b6dee251ef101cf0
(cherry picked from commit 79cc4f9212)
2014-05-02 11:59:11 -07:00
Dirk Dougherty
6ac22572e5 Update appengine server to handle '@'.
Change-Id: Ic06686f94d8cff822808e30034b102e859833454
2013-07-17 10:08:27 -07:00
Dirk Dougherty
90b9ab16f9 Merge commit 'b1637825' into manualmerge
Conflicts:
	scripts/app_engine_server/redirects.yaml

Change-Id: If68fc5e8461f3f9d63d00cc251e4bed2531d7025
2013-06-26 10:58:30 -07:00
Dirk Dougherty
b1637825c1 am 392804d0: Adjust the redirects for edu and a couple others.
* commit '392804d01ce967c5ec4d00b710c7664f42c3d736':
  Adjust the redirects for edu and a couple others.
2013-06-26 10:40:48 -07:00
Dirk Dougherty
392804d01c Adjust the redirects for edu and a couple others.
Change-Id: I95049ad68a4ecc31354f9e97e10d83114be8bb78
2013-06-26 10:34:59 -07:00
Robert Ly
af5f663ae0 am 56329479: am 6bd35b5b: Revert "make target for gms and gcm javadocs and to automate entire docs build"
* commit '5632947990326ebb2cd81e567e7b0d282672c2fd':
  Revert "make target for gms and gcm javadocs and to automate entire docs build"
2013-06-17 09:54:43 -07:00
Robert Ly
5632947990 am 6bd35b5b: Revert "make target for gms and gcm javadocs and to automate entire docs build"
* commit '6bd35b5bd685355b673a36ed96b77ddd13a0bff4':
  Revert "make target for gms and gcm javadocs and to automate entire docs build"
2013-06-17 09:52:40 -07:00
Robert Ly
6bd35b5bd6 Revert "make target for gms and gcm javadocs and to automate entire docs build"
This reverts commit 2deefec495.

Change-Id: I60be16d5233568a8ffcf6ec09952261b854275a8
2013-06-17 16:10:59 +00:00
Robert Ly
0e7706f307 am 128c2f02: am 2deefec4: make target for gms and gcm javadocs and to automate entire docs build
* commit '128c2f0265307ef5f36bd073148b46ef545db1c2':
  make target for gms and gcm javadocs and to automate entire docs build
2013-06-13 15:35:55 -07:00
Robert Ly
128c2f0265 am 2deefec4: make target for gms and gcm javadocs and to automate entire docs build
* commit '2deefec495526a521f16e4c0d6e19f2969462199':
  make target for gms and gcm javadocs and to automate entire docs build
2013-06-13 15:34:14 -07:00
Robert Ly
2deefec495 make target for gms and gcm javadocs and to automate entire docs build
Change-Id: Iea7d17782f41c91e42a244bf8c67c30b64c43ede
2013-06-11 22:54:04 +00:00
Scott Main
a078714667 redirect all UI guideline docs to Design docs
except for widgets, pending b/9303742

Change-Id: I9b896e6c88701044f572ab79813d43c2f34b81b9
2013-06-05 20:46:59 -07:00
Chet Haase
f04a0b09a1 am 8654b6c6: am 3ff1591c: am 28b127ec: New DevBytes animation demos
* commit '8654b6c6ac430c285d9ad5bc7999a1c5390efa61':
  New DevBytes animation demos
2013-05-30 15:04:40 -07:00
Chet Haase
8654b6c6ac am 3ff1591c: am 28b127ec: New DevBytes animation demos
* commit '3ff1591c5b1d90c876145b8a60dfc21cf93a0362':
  New DevBytes animation demos
2013-05-30 15:02:07 -07:00
Chet Haase
3ff1591c5b am 28b127ec: New DevBytes animation demos
* commit '28b127ec1e5af575a74af679a8542042112d177e':
  New DevBytes animation demos
2013-05-30 15:00:20 -07:00
Jeff Sharkey
39ffbccdd4 Generalize support library tests.
Change-Id: Icc147a16a90fbb83584424e239e40acc87de8328
2013-05-30 14:28:43 -07:00
Chet Haase
28b127ec1e New DevBytes animation demos
Change-Id: Ib475ddb109e0e62f0f085b6591ca15af0b79f75b
2013-05-30 13:38:02 -07:00
Scott Main
5ef71146ce more redirects for deleted files
Change-Id: I586b34871ad8e2dd7b2d3f3a417e01732a8d262b
2013-05-20 18:18:09 -07:00
Scott Main
42ba057a23 redirect obsolete publishing files, as per removals from I715362c1dc7022581faf8653ec49da49b3c6ed4a
Change-Id: I2f3c62a7a18f370c376e1edf6dc9c43983bc6edb
2013-05-20 14:26:01 -07:00
Dirk Dougherty
fd81d9ec33 am 6465f504: am 69abf615: Add redirects for edu urls.
* commit '6465f50405c552621bd1888bc32226892ae35cb7':
  Add redirects for edu urls.
2013-05-15 07:32:01 -07:00
Dirk Dougherty
6465f50405 am 69abf615: Add redirects for edu urls.
* commit '69abf615cec2734c17e677b579471f6475718880':
  Add redirects for edu urls.
2013-05-15 06:38:31 -07:00
Dirk Dougherty
69abf615ce Add redirects for edu urls.
Change-Id: I549cfba56a4865b0eac2f308b489000b9db9497c
2013-05-15 04:26:57 -07:00
Xavier Ducrohet
44bafdcc06 Merge "DO NOT MERGE. Example code for FileProvider." into jb-mr1.1-ub-dev 2013-05-13 18:40:48 +00:00
Jeff Sharkey
739532e2c7 DO NOT MERGE. Example code for FileProvider.
Shows simple usage of FileProvider to share a private thumbnail
across process boundaries.  Also serves as sample code for javadoc
on FileProvider.

Bug: 7005318
Change-Id: I0ca12977a3832c7c2ac1c254d411a547ffee0a51
2013-05-13 11:38:44 -07:00
Xavier Ducrohet
9cac156c87 Move support lib to 13. do not merge.
Change-Id: Icf097a38d102cf1684f64b737fcda2d4fa18068d
2013-05-13 10:22:33 -07:00
Scott Main
138f3a3139 add nav drawer sample
Change-Id: I561c7577554c587b4ecacfc6f22fc2beefce27b1
2013-05-10 13:16:09 -07:00
Dirk Dougherty
b98e5bb928 am 32bd1410: am 4df667f4: Add devsite-compatible lang ids to whitelist and add a redirect for the old uppercase ids.
* commit '32bd1410bce06aed02531e9289b957ab401ec8a1':
  Add devsite-compatible lang ids to whitelist and add a redirect for the old uppercase ids.
2013-05-06 18:53:56 -07:00
Dirk Dougherty
32bd1410bc am 4df667f4: Add devsite-compatible lang ids to whitelist and add a redirect for the old uppercase ids.
* commit '4df667f498ccdcde28a572a5e45c8324e3d1c598':
  Add devsite-compatible lang ids to whitelist and add a redirect for the old uppercase ids.
2013-05-06 18:52:20 -07:00
Dirk Dougherty
4df667f498 Add devsite-compatible lang ids to whitelist and add a redirect for the old uppercase ids.
Change-Id: I1fada8710a43a9ac8d3d2d12a53023e78d686513
2013-05-06 18:44:36 -07:00
Scott Main
226d3cec41 am 7581d0aa: am 952b2a0f: add redirects reflecting changes from Icbcb0f042ac5f05d17d42be4c5c122316e93b866
* commit '7581d0aae28a291a529d0ef3ab2960a65831bb2a':
  add redirects reflecting changes from Icbcb0f042ac5f05d17d42be4c5c122316e93b866
2013-05-06 17:18:58 -07:00
Scott Main
7581d0aae2 am 952b2a0f: add redirects reflecting changes from Icbcb0f042ac5f05d17d42be4c5c122316e93b866
* commit '952b2a0f132b90b2fdea43bdc3f5eba0fe4f8464':
  add redirects reflecting changes from Icbcb0f042ac5f05d17d42be4c5c122316e93b866
2013-05-06 17:16:27 -07:00
Scott Main
952b2a0f13 add redirects reflecting changes from Icbcb0f042ac5f05d17d42be4c5c122316e93b866
Change-Id: I5e13e47788b8e60e68529241e445e99174b096cf
2013-05-06 17:01:39 -07:00
Dirk Dougherty
e1aaf659df am 940e2048: am 299f3fdd: Add redirect for new location docs path.
* commit '940e2048ef7acbc27921c6babf36062548b0dffe':
  Add redirect for new location docs path.
2013-05-04 10:55:43 -07:00
Dirk Dougherty
940e2048ef am 299f3fdd: Add redirect for new location docs path.
* commit '299f3fdddc7f600dba7ccaa93a3add23a115150b':
  Add redirect for new location docs path.
2013-05-04 10:53:52 -07:00