commit | 08f5e52f5b23641ac66eccbb622930daa96cb7ae | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Wed Apr 30 00:49:43 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 30 00:49:43 2014 +0000 |
tree | 5774f133eb0d1029252e7b256368daf72f7898e7 | |
parent | b29ee7e91a40018460d9a7dd32d220a5ea18c861 [diff] | |
parent | 8c22f86128c2f64c57e5c7b6f294d5879feae124 [diff] |
am 8c22f861: Merge commit \'05fa6fe6de8d3a3b9f2d0d70533bd911ec9094be\' into HEAD * commit '8c22f86128c2f64c57e5c7b6f294d5879feae124':