Skip to content
Commits on Jan 13, 2012
  1. Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"

    Jean-Baptiste Queru committed with android code review
Commits on Jan 12, 2012
  1. @mansr @mstorsjo

    stagefright aacenc/amrwbenc: Remove trailing whitespace

    mansr committed with mstorsjo
    This was applied in AOSP master earlier, in commit
    b21611e, but when merged
    into the Google internal tree in
    88c2d4d, none of these
    changes have been brought in. (The diff of this merge commit
    and its first parent, d94b71d, is empty.)
    
    Therefore, reapply the rest of these changes on the files
    that still are present in the current version.
    
    Change-Id: I645a9b9134769958a11808a06163123d28d83e46
Commits on Jan 11, 2012
  1. Fix Apache stack

    John Reck committed with Jean-Baptiste Queru
    Change-Id: Iec7d0d8bdaaa5594fa7412db79943ab0ccdf594c
Commits on Dec 16, 2011
  1. Reconcile with ics-mr1-release

    The Android Open Source Project committed
    Change-Id: Ib2cbd92ed2d3567e22921b66ca2202a968fdd0da
  2. @ddougherty

    am 8b6ed2d: Doc change: edits to ICS MR1 API Overview.

    ddougherty committed with Android Git Automerger
    * commit '8b6ed2d17d5e7e47944026679c9cba66611ab27f':
      Doc change: edits to ICS MR1 API Overview.
  3. @ddougherty

    Doc change: edits to ICS MR1 API Overview.

    ddougherty committed
    Change-Id: Idb18e3085b3dd54c9a39e74c37428c3d5b28aa83
  4. am 5b18c71: Merge "docs: Release Notes v2 for Android 4.0.3, ADT 16.0…

    Joe Fernandez committed with Android Git Automerger
    ….1, Support lib r5-r6" into ics-mr1
    
    * commit '5b18c714bbff269d7db880b42de34fd1385da9f9':
      docs: Release Notes v2 for Android 4.0.3, ADT 16.0.1, Support lib r5-r6
  5. Merge "docs: Release Notes v2 for Android 4.0.3, ADT 16.0.1, Support …

    Joe Fernandez committed with Android (Google) Code Review
    …lib r5-r6" into ics-mr1
  6. docs: Release Notes v2 for Android 4.0.3, ADT 16.0.1, Support lib r5-r6

    Joe Fernandez committed
    Change-Id: I628cd076cd37f6252837de276c4b7a9040c37bc1
  7. am 14633f1: am 48e0617: Fixed Android U Enterprise lesson pre-requisi…

    Fred Chung committed with Android Git Automerger
    …tes and a minor typo.
    
    * commit '14633f1b1eea585cdc094ebae75708db2293fe56':
      Fixed Android U Enterprise lesson pre-requisites and a minor typo.
  8. am 48e0617: Fixed Android U Enterprise lesson pre-requisites and a mi…

    Fred Chung committed with Android Git Automerger
    …nor typo.
    
    * commit '48e0617b9e7d06da803c572d6584d68898733d37':
      Fixed Android U Enterprise lesson pre-requisites and a minor typo.
  9. Fixed Android U Enterprise lesson pre-requisites and a minor typo.

    Fred Chung committed
    Change-Id: Ide393a0957f3e797f14d7c349c35337849b15f02
  10. @scottamain

    am 8e980c1: Merge "docs: Release Notes for Android 4.0.3, ADT 16.0.1,…

    scottamain committed with Android Git Automerger
    … Support lib r5-r6" into ics-mr1
    
    * commit '8e980c1e4e86cb4c7ea679eba3cc01d64e323b26':
      docs: Release Notes for Android 4.0.3, ADT 16.0.1, Support lib r5-r6
  11. @scottamain

    Merge "docs: Release Notes for Android 4.0.3, ADT 16.0.1, Support lib…

    scottamain committed with Android (Google) Code Review
    … r5-r6" into ics-mr1
  12. @scottamain

    am 36c6778: docs: update homepage for 4.0.3 announcment

    scottamain committed with Android Git Automerger
    * commit '36c677855c0a54ede9e92aa856cb2250960e922e':
      docs: update homepage for 4.0.3 announcment
  13. @scottamain

    docs: update homepage for 4.0.3 announcment

    scottamain committed
    Change-Id: I54d1d447ac224982f4483afede2087ce18937ed0
  14. @jgennis

    SurfaceMediaSource: use the HW_TEXTURE usage bit

    jgennis committed with The Android Automerger
    This change makes SurfaceMediaSource request Gralloc buffers with the
    HW_TEXTURE usage bit rather than the VIDEO_ENCODER bit.  It is a
    temporary workaround for what is likely a Gralloc bug.
    
    Bug: 5771063
    Change-Id: I9cce615e80fc14a1644fae27ba06970c262dd179
  15. merge in ics-mr1-release history after reset to ics-mr1

    The Android Automerger committed
  16. @scottamain

    am 4cb7d09: am 98af5ed: docs: fix encoding issue or whatever with doc…

    scottamain committed with Android Git Automerger
    …s (not showing titles)
    
    * commit '4cb7d0953534587ba2051c6536fdde4b2c9539d5':
      docs: fix encoding issue or whatever with docs (not showing titles)
  17. @scottamain

    am 98af5ed: docs: fix encoding issue or whatever with docs (not showi…

    scottamain committed with Android Git Automerger
    …ng titles)
    
    * commit '98af5edc70b0b418366f5197b9aeef30f135d40e':
      docs: fix encoding issue or whatever with docs (not showing titles)
  18. @jgennis

    SurfaceMediaSource: use the HW_TEXTURE usage bit

    jgennis committed with The Android Automerger
    This change makes SurfaceMediaSource request Gralloc buffers with the
    HW_TEXTURE usage bit rather than the VIDEO_ENCODER bit.  It is a
    temporary workaround for what is likely a Gralloc bug.
    
    Bug: 5771063
    Change-Id: I9cce615e80fc14a1644fae27ba06970c262dd179
  19. @scottamain

    docs: fix encoding issue or whatever with docs (not showing titles)

    scottamain committed
    Change-Id: Iac9afc3aa36e86d2f8defc8a7252864c23ecc23b
  20. @scottamain

    am 8f266b9: am d9bc2d2: Merge "docs: add remembering users class to n…

    scottamain committed with Android Git Automerger
    …av" into ics-mr0
    
    * commit '8f266b9e348ba69d953568624b8d0e2cea07f99d':
      docs: add remembering users class to nav
  21. @scottamain

    am d9bc2d2: Merge "docs: add remembering users class to nav" into ics…

    scottamain committed with Android Git Automerger
    …-mr0
    
    * commit 'd9bc2d21c55e58f83e4209749cc51f0da9869b54':
      docs: add remembering users class to nav
  22. @scottamain

    Merge "docs: add remembering users class to nav" into ics-mr0

    scottamain committed with Android (Google) Code Review
  23. @scottamain

    am 26e461b: am 5dac197: Merge "Doc merge from master:Training class o…

    scottamain committed with Android Git Automerger
    …n Identifying and Authenticating Users." into ics-mr0
    
    * commit '26e461b34f5f9eef79aa30f1304cca4262ff88ed':
      Doc merge from master:Training class on Identifying and Authenticating Users.
  24. @scottamain

    am 5dac197: Merge "Doc merge from master:Training class on Identifyin…

    scottamain committed with Android Git Automerger
    …g and Authenticating Users." into ics-mr0
    
    * commit '5dac1976198e5fa553749cd145c7484f3ff45c6b':
      Doc merge from master:Training class on Identifying and Authenticating Users.
  25. @scottamain

    docs: add remembering users class to nav

    scottamain committed
    Change-Id: Iedfd5c6580dd2d23df1eaf4da6cf43d77b5866f8
  26. @scottamain

    Merge "Doc merge from master:Training class on Identifying and Authen…

    scottamain committed with Android (Google) Code Review
    …ticating Users." into ics-mr0
  27. @scottamain

    am ce5643c: am abfcbd1: docs: typo in training orientation

    scottamain committed with Android Git Automerger
    * commit 'ce5643c7c43c2c680e683c56507ffa1bf5b9a316':
      docs: typo in training orientation
  28. @scottamain

    am abfcbd1: docs: typo in training orientation

    scottamain committed with Android Git Automerger
    * commit 'abfcbd162ff0f3baf45436614a1ea7ce6c032df1':
      docs: typo in training orientation
  29. @ddougherty @IanNiLewis

    Doc merge from master:Training class on Identifying and Authenticatin…

    ddougherty committed with IanNiLewis
    …g Users.
    
    Conflicts:
    
    	docs/html/training/id-auth/authenticate.jd
    	docs/html/training/id-auth/custom_auth.jd
    	docs/html/training/id-auth/identify.jd
    	docs/html/training/id-auth/index.jd
    
    Change-Id: I73174b2cb923ec5d28b551f27d0512d427616c69
  30. @scottamain

    docs: typo in training orientation

    scottamain committed
    Change-Id: I9535713d7784146e96df5b347f2be38628ce7d2c
  31. am 1584a81: am 408f94b: Merge "docs: Minor bugfix to Android U naviga…

    Roman Nurik committed with Android Git Automerger
    …tion design class" into ics-mr0
    
    * commit '1584a816ed2e431ae804954dc6bd2d9dc79a540e':
      docs: Minor bugfix to Android U navigation design class
  32. am 408f94b: Merge "docs: Minor bugfix to Android U navigation design …

    Roman Nurik committed with Android Git Automerger
    …class" into ics-mr0
    
    * commit '408f94b1478c62f953faf29b02c3af5d8d3c5e05':
      docs: Minor bugfix to Android U navigation design class
Something went wrong with that request. Please try again.