author | Elliott Hughes <enh@google.com> | |
Wed, 9 May 2012 20:53:37 +0000 (13:53 -0700) | ||
committer | Elliott Hughes <enh@google.com> | |
Wed, 9 May 2012 20:53:37 +0000 (13:53 -0700) | ||
commit | dbd5ecad26e39281bb83f97664bc32555c5c071a | |
tree | 1d652ad548a322f09cb77e8f5fce98eb7892fbd0 | tree | snapshot (tar.xz tar.gz zip) |
parent | 58a00b4977b6fa073a8f56d94d741b1e4cb49856 | commit | diff |
parent | e54089079b123b207e171c14b2b0dca23c9386f3 | commit | diff |
resolved conflicts for merge of e5408907 to jb-dev-plus-aosp
Change-Id: If4c3f51bf87b28da8074be2e46ae772a374b266f
Change-Id: If4c3f51bf87b28da8074be2e46ae772a374b266f