tree c45506607e475082bf02c845bd81203627287a3c
parent 5d0c7add1e93087fc865a3e3a7ae06f08de9fffc
parent 1b15eeff628432c5addf122830e37c0eecdcd167
author Adam Powell <adamp@google.com> 1329173117 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1329173117 -0800

am 1b15eeff: am bd4ed960: am 58589851: am 15a14930: Merge "Add AppNavigation demo" into ics-mr1

* commit '1b15eeff628432c5addf122830e37c0eecdcd167':