tree a74e88dce5aa74bc8c19b3204d617da8159757bc
parent 24ed1b2fb53761859d2866d3e9676f41fd158f1e
parent a231071249f03f7b10e1991c9988476d2b15a9f7
author Robert Ly <robertly@google.com> 1330649218 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1330649218 -0800

am a2310712: am 9d36dcc0: am dcc910ea: Merge "docs: fix bug 5878445" into ics-mr1

* commit 'a231071249f03f7b10e1991c9988476d2b15a9f7':