commit | 759c8f4a99f07c6b4d2b8d3ac135bfdd2b1f269a | [log] [tgz] |
---|---|---|
author | boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2> | Tue Dec 10 01:48:14 2013 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 10 01:48:14 2013 +0000 |
tree | 561ccc2f85b1b6f91a556d651fe6d5320d3ef3db | |
parent | e38b7f420cd796fdc2b6893e0f1124c9acdd4ef6 [diff] | |
parent | d029b0a0cbde888746df2b3fc0a75269436e9499 [diff] |
am d029b0a0: (-s ours) am ff02a590: Cherry-pick with modifications: cc: Fix HeadsUpDisplayLayerImpl NPE after resource loss * commit 'd029b0a0cbde888746df2b3fc0a75269436e9499':